changeset 15608:3f10bd32ef1c

merge of '12c5fcf0819724b3304461672fc4bd1ebf0a8287' and 'e485e0b2753d7eb36ce2f7abf8a6eb040cae49b7'
author Richard Laager <rlaager@wiktel.com>
date Sat, 10 Feb 2007 01:14:57 +0000
parents b74030931888 (diff) b03021cef5cb (current diff)
children 02d64952a55e b74a3bec8dcb
files
diffstat 4 files changed, 3624 insertions(+), 3413 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Feb 09 17:23:47 2007 +0000
+++ b/Makefile.am	Sat Feb 10 01:14:57 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = config.rpath m4/ChangeLog  \
+EXTRA_DIST = \
 		COPYRIGHT \
 		ChangeLog.API \
 		ChangeLog.win32 \
--- a/libpurple/protocols/yahoo/yahoo_profile.c	Fri Feb 09 17:23:47 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_profile.c	Sat Feb 10 01:14:57 2007 +0000
@@ -1006,7 +1006,7 @@
 	/* extract their Yahoo! ID and put it in. Don't bother marking has_info as
 	 * true, since the Yahoo! ID will always be there */
 	if (!gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->yahoo_id_string, 10, "\n", 0,
+			strings->yahoo_id_string, (yd->jp ? 2 : 10), "\n", 0,
 			NULL, _("Yahoo! ID"), 0, NULL, NULL))
 		;
 #endif
@@ -1033,7 +1033,7 @@
 
 	/* extract their Email address and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->my_email_string, 1, " ", 0,
+			strings->my_email_string, (yd->jp ? 4 : 1), " ", 0,
 			strings->private_string, _("E-Mail"), 0, NULL, NULL);
 
 	/* extract the Nickname if it exists */
@@ -1043,27 +1043,27 @@
 
 	/* extract their RealName and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->realname_string, 1, "\n", '\n',
+			strings->realname_string, (yd->jp ? 3 : 1), "\n", '\n',
 			NULL, _("Real Name"), 0, NULL, NULL);
 
 	/* extract their Location and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->location_string, 2, "\n", '\n',
+			strings->location_string, (yd->jp ? 4 : 2), "\n", '\n',
 			NULL, _("Location"), 0, NULL, NULL);
 
 	/* extract their Age and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->age_string, 3, "\n", '\n',
+			strings->age_string, (yd->jp ? 2 : 3), "\n", '\n',
 			NULL, _("Age"), 0, NULL, NULL);
 
 	/* extract their MaritalStatus and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->maritalstatus_string, 3, "\n", '\n',
+			strings->maritalstatus_string, (yd->jp ? 2 : 3), "\n", '\n',
 			strings->no_answer_string, _("Marital Status"), 0, NULL, NULL);
 
 	/* extract their Gender and put it in */
 	found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->gender_string, 3, "\n", '\n',
+			strings->gender_string, (yd->jp ? 2 : 3), "\n", '\n',
 			strings->no_answer_string, _("Gender"), 0, NULL, NULL);
 
 	/* extract their Occupation and put it in */
@@ -1081,7 +1081,7 @@
 	 */
 
 	if (!gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-			strings->hobbies_string, 1, strings->latest_news_string,
+			strings->hobbies_string, (yd->jp ? 3 : 1), strings->latest_news_string,
 			'\n', "\n", _("Hobbies"), 0, NULL, NULL))
 	{
 		if (!gaim_markup_extract_info_field(stripped, stripped_len, user_info,
@@ -1103,7 +1103,7 @@
 			'\n', "\n", _("Latest News"), 0, NULL, NULL))
 	{
 		found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-				strings->latest_news_string, 1, strings->links_string,
+				strings->latest_news_string, (yd->jp ? 2 : 1), strings->links_string,
 				'\n', "\n", _("Latest News"), 0, NULL, NULL);
 	}
 	else
@@ -1162,8 +1162,8 @@
 
 		/* extract the Last Updated date and put it in */
 		found |= gaim_markup_extract_info_field(stripped, stripped_len, user_info,
-				last_updated_utf8_string, 1, " ", '\n', NULL,
-				_("Last Update"), 0, NULL, yahoo_info_date_reformat);
+				last_updated_utf8_string, (yd->jp ? 2 : 1), (yd->jp ? "\n" : " "), (yd->jp ? 0 : '\n'), NULL,
+				_("Last Update"), 0, NULL, (yd->jp ? NULL : yahoo_info_date_reformat));
 	}
 	} /* if (profile_state == PROFILE_STATE_DEFAULT) */
 
--- a/pidgin/pixmaps/dialogs/16/Makefile.am	Fri Feb 09 17:23:47 2007 +0000
+++ b/pidgin/pixmaps/dialogs/16/Makefile.am	Sat Feb 10 01:14:57 2007 +0000
@@ -1,4 +1,4 @@
-SIBDIRS = scalable
+SUBDIRS = scalable
 
 EXTRA_DIST = 	auth.png \
 		error.png \
--- a/po/eo.po	Fri Feb 09 17:23:47 2007 +0000
+++ b/po/eo.po	Sat Feb 10 01:14:57 2007 +0000
@@ -3,16 +3,16 @@
 #
 # Copyright (C) 2006, Stéphane Fillod <fillods@users.sourceforge.net>
 #
-# Stéphane Fillod <f8cfe@free.fr>, 2006.
+# Stéphane Fillod <f8cfe@free.fr>, 2006, 2007.
 # This file is distributed under the same license as the Gaim package.
 msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-11 11:45+0100\n"
-"PO-Revision-Date: 2006-11-12 18:59+0100\n"
+"POT-Creation-Date: 2007-01-25 00:00-0500\n"
+"PO-Revision-Date: 2007-01-28 23:07+0100\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
-"Language-Team: Esperanto\n"
+"Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,16 +31,16 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:266
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
-#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntaccount.c:119 ../console/gntblist.c:272
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
 #: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1363
-#: ../libgaim/protocols/jabber/chat.c:677
-#: ../libgaim/protocols/jabber/chat.c:688
-#: ../libgaim/protocols/jabber/jabber.c:1188
-#: ../libgaim/protocols/qq/group_join.c:322
-#: ../libgaim/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Eraro"
 
@@ -52,15 +52,15 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Ekrannomo de konto ne devas esti malplena."
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
 msgid "New mail notifications"
 msgstr "Nova retpoŝto avizoj"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
 msgid "Remember password"
 msgstr "Memoru pasvorton"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
 msgid "Modify Account"
 msgstr "Ŝanĝu Konton"
 
@@ -68,100 +68,91 @@
 msgid "New Account"
 msgstr "Nova Konto"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Ekrannomo:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
 msgid "Password:"
 msgstr "Pasvorton:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
 msgid "Alias:"
 msgstr "Alinomo:"
 
 #. Cancel
 #: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:307
-#: ../console/gntblist.c:374 ../console/gntblist.c:407
-#: ../console/gntblist.c:736 ../console/gntblist.c:905
-#: ../console/gntblist.c:996 ../console/gntblist.c:1949
+#: ../console/gntaccount.c:834 ../console/gntblist.c:313
+#: ../console/gntblist.c:380 ../console/gntblist.c:413
+#: ../console/gntblist.c:737 ../console/gntblist.c:906
+#: ../console/gntblist.c:997 ../console/gntblist.c:2021
 #: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
-#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
-#: ../gtk/gtkdialogs.c:683 ../gtk/gtkdialogs.c:820 ../gtk/gtkdialogs.c:911
-#: ../gtk/gtkdialogs.c:930 ../gtk/gtkdialogs.c:952 ../gtk/gtkdialogs.c:972
-#: ../gtk/gtkdialogs.c:1016 ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1108
-#: ../gtk/gtkdialogs.c:1145 ../gtk/gtkdialogs.c:1170
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
-#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
 #: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:964
-#: ../libgaim/account.c:1135 ../libgaim/account.c:1169
-#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
-#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
-#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1725
-#: ../libgaim/protocols/jabber/buddy.c:1759
-#: ../libgaim/protocols/jabber/chat.c:780
-#: ../libgaim/protocols/jabber/jabber.c:850
-#: ../libgaim/protocols/jabber/jabber.c:1343
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
-#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
-#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
-#: ../libgaim/protocols/oscar/oscar.c:1389
-#: ../libgaim/protocols/oscar/oscar.c:2153
-#: ../libgaim/protocols/oscar/oscar.c:2192
-#: ../libgaim/protocols/oscar/oscar.c:2240
-#: ../libgaim/protocols/oscar/oscar.c:5734
-#: ../libgaim/protocols/oscar/oscar.c:5786
-#: ../libgaim/protocols/oscar/oscar.c:5938
-#: ../libgaim/protocols/oscar/oscar.c:5963
-#: ../libgaim/protocols/oscar/oscar.c:6019
-#: ../libgaim/protocols/oscar/oscar.c:6088
-#: ../libgaim/protocols/oscar/peer.c:991
-#: ../libgaim/protocols/qq/buddy_info.c:480
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_join.c:357
-#: ../libgaim/protocols/qq/group_opt.c:140
-#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
-#: ../libgaim/protocols/qq/sendqueue.c:201
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/sametime/sametime.c:3484
-#: ../libgaim/protocols/sametime/sametime.c:3654
-#: ../libgaim/protocols/sametime/sametime.c:5402
-#: ../libgaim/protocols/sametime/sametime.c:5491
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
+#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
 #: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
 #: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
 msgid "Cancel"
 msgstr "Rezignu"
 
 #. Save
 #: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
-#: ../libgaim/protocols/jabber/buddy.c:587
+#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "Konservu"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
-#: ../gtk/gtksavedstatuses.c:293
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ĉu vi certas vi volas forigi %s-n?"
@@ -173,13 +164,13 @@
 
 #: ../console/gntaccount.c:615 ../console/gntaccount.c:681
 #: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:295
+#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1870
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "Kontoj"
 
@@ -188,14 +179,13 @@
 msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
 
 #: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:307 ../console/gntblist.c:374
-#: ../console/gntblist.c:407 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383
-#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2431
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:5490
+#: ../console/gntblist.c:313 ../console/gntblist.c:380
+#: ../console/gntblist.c:413 ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
 #: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Aldonu"
@@ -204,224 +194,235 @@
 msgid "Modify"
 msgstr "Ŝanĝu"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s faris %s-n sia kunul%s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
 msgid "Add buddy to your list?"
 msgstr "Aldonu kunulon al via listo?"
 
-#: ../console/gntblist.c:258
+#: ../console/gntblist.c:264
 msgid "You must provide a screename for the buddy."
 msgstr "Vi devas enigi ekrannomon por la kunul."
 
-#: ../console/gntblist.c:260
+#: ../console/gntblist.c:266
 msgid "You must provide a group."
 msgstr "Vi devas enigi grupon."
 
-#: ../console/gntblist.c:262
+#: ../console/gntblist.c:268
 msgid "You must select an account."
 msgstr "Vi devas elekti konton."
 
-#: ../console/gntblist.c:266
+#: ../console/gntblist.c:272
 msgid "Error adding buddy"
 msgstr "Eraro aldonante kunul"
 
-#: ../console/gntblist.c:291 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
 msgid "Screen Name"
 msgstr "Ekranonomo"
 
-#: ../console/gntblist.c:294 ../console/gntblist.c:366 ../gtk/gtkdialogs.c:929
-#: ../gtk/gtkdialogs.c:951 ../gtk/gtkdialogs.c:971 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/silc/chat.c:587
+#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
 msgid "Alias"
 msgstr "Alinomo"
 
-#: ../console/gntblist.c:297 ../console/gntblist.c:369
+#: ../console/gntblist.c:303 ../console/gntblist.c:375
 msgid "Group"
 msgstr "Grupo"
 
-#: ../console/gntblist.c:300 ../console/gntblist.c:357
-#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
-#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
-#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
-#: ../libgaim/plugins/idle.c:189
+#: ../console/gntblist.c:306 ../console/gntblist.c:363
+#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "Konto"
 
-#: ../console/gntblist.c:306 ../console/gntblist.c:783 ../gtk/gtkblist.c:4896
+#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
 #: ../libgaim/protocols/silc/buddy.c:1075
 #: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3128
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
 msgid "Add Buddy"
 msgstr "Aldonu Kunulon"
 
-#: ../console/gntblist.c:306
+#: ../console/gntblist.c:312
 msgid "Please enter buddy information."
 msgstr "B.v. enigi kunul informon."
 
-#: ../console/gntblist.c:329 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "Babilejoj"
 
 #. Extract their Name and put it in
-#. Contact Info
-#. Personal
-#. Business
-#: ../console/gntblist.c:363 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
 #: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:781
-#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
-#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "Nomo"
 
-#: ../console/gntblist.c:372 ../console/gntblist.c:785 ../gtk/gtkblist.c:5274
+#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
 msgid "Add Chat"
 msgstr "Aldonu Babilejon"
 
-#: ../console/gntblist.c:373
+#: ../console/gntblist.c:379
 msgid "You can edit more information from the context menu later."
 msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
 
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
 msgid "Error adding group"
 msgstr "Eraro aldonante grupo"
 
-#: ../console/gntblist.c:385
+#: ../console/gntblist.c:391
 msgid "You must give a name for the group to add."
 msgstr "Vi devas enigi nomon de la grupo aldonenda."
 
-#: ../console/gntblist.c:398
+#: ../console/gntblist.c:404
 msgid "A group with the name already exists."
 msgstr "Grupo samnomita jam ekzistas."
 
-#: ../console/gntblist.c:405 ../console/gntblist.c:787 ../gtk/gtkblist.c:5380
-#: ../libgaim/protocols/sametime/sametime.c:5401
-#: ../libgaim/protocols/sametime/sametime.c:5488
+#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
 msgid "Add Group"
 msgstr "Aldonu Grupon"
 
-#: ../console/gntblist.c:405
+#: ../console/gntblist.c:411
 msgid "Enter the name of the group"
 msgstr "B.v. enigi la nomon de la grupo"
 
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:736
 msgid "Edit Chat"
 msgstr "Redaktu Babilejon"
 
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:736
 msgid "Please Update the necessary fields."
 msgstr "B.v. Aktualigi la necesajn kampojn."
 
-#: ../console/gntblist.c:736 ../console/gntstatus.c:196
+#: ../console/gntblist.c:737 ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "Redaktu"
 
-#: ../console/gntblist.c:750
+#: ../console/gntblist.c:751
 msgid "Auto-join"
 msgstr "Aŭtomate-aliĝu"
 
-#: ../console/gntblist.c:759
+#: ../console/gntblist.c:760
 msgid "Edit Settings"
 msgstr "Agordu"
 
-#: ../console/gntblist.c:805 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Ricevu Informon"
 
-#: ../console/gntblist.c:810
+#: ../console/gntblist.c:811
 msgid "Add Buddy Pounce"
 msgstr "Aldonu Kunul Atentigon"
 
-#: ../console/gntblist.c:817 ../gtk/gtkconv.c:1582
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
 msgid "Send File"
 msgstr "Sendu Dosieron"
 
-#: ../console/gntblist.c:821
+#: ../console/gntblist.c:822
 msgid "View Log"
 msgstr "Montru Protokolon"
 
-#: ../console/gntblist.c:901
+#: ../console/gntblist.c:902
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "B.v. enigi la novan nomon por %s"
 
-#: ../console/gntblist.c:903 ../console/gntblist.c:904
-#: ../console/gntblist.c:1073
+#: ../console/gntblist.c:904 ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
 msgid "Rename"
 msgstr "Alinomu"
 
-#: ../console/gntblist.c:903
+#: ../console/gntblist.c:904
 msgid "Enter empty string to reset the name."
 msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
 
-#: ../console/gntblist.c:976
+#: ../console/gntblist.c:977
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
 
-#: ../console/gntblist.c:984
+#: ../console/gntblist.c:985
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
 
-#: ../console/gntblist.c:989
+#: ../console/gntblist.c:990
 #, 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?
-#: ../console/gntblist.c:992
+#: ../console/gntblist.c:993
 msgid "Confirm Remove"
 msgstr "Konfirmu Forigon"
 
-#: ../console/gntblist.c:995 ../console/gntblist.c:1075 ../gtk/gtkblist.c:1039
-#: ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
 msgid "Remove"
 msgstr "Forigu"
 
 #. Buddy List
-#: ../console/gntblist.c:1050 ../console/gntblist.c:2016
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
 #: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
 msgstr "Kunul Listo"
 
-#: ../console/gntblist.c:1079
+#: ../console/gntblist.c:1123
 msgid "Place tagged"
 msgstr "Loko etikedita"
 
-#: ../console/gntblist.c:1082
-msgid "Tag"
-msgstr "Etikedo"
-
-#: ../console/gntblist.c:1109 ../console/gntblist.c:1228
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
-
-#: ../console/gntblist.c:1134
-#, c-format
-msgid ""
-"\n"
-"Idle: %s"
-msgstr ""
-"\n"
-"Senfara: %s"
-
-#: ../console/gntblist.c:1191 ../console/gntblist.c:1207
-#, c-format
-msgid "Nickname: %s\n"
-msgstr "Karesnomo: %s\n"
-
-#: ../console/gntblist.c:1219
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr ""
+
+#. General
+#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "Karesnomo"
+
+#. Idle stuff
+#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "Senfara"
+
+#: ../console/gntblist.c:1270
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -430,7 +431,12 @@
 "Konektita: %d\n"
 "Entute: %d"
 
-#: ../console/gntblist.c:1240
+#: ../console/gntblist.c:1279
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../console/gntblist.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -439,88 +445,79 @@
 "\n"
 "Laste vidita: antaŭ %s"
 
-#: ../console/gntblist.c:1485 ../gtk/gtkdocklet.c:478
-#: ../gtk/gtkstatusbox.c:984
+#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
 msgid "New..."
 msgstr "Nova..."
 
-#: ../console/gntblist.c:1492 ../gtk/gtkdocklet.c:479
-#: ../gtk/gtkstatusbox.c:985
+#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
 msgid "Saved..."
 msgstr "Konservita..."
 
-#: ../console/gntblist.c:1838 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
 msgid "Plugins"
 msgstr "Kromaĵoj"
 
-#: ../console/gntblist.c:1930 ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801
-#: ../gtk/gtkdialogs.c:881
+#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
 msgid "_Name"
 msgstr "_Nomo"
 
-#: ../console/gntblist.c:1935 ../gtk/gtkdialogs.c:669 ../gtk/gtkdialogs.c:806
-#: ../gtk/gtkdialogs.c:886
+#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../console/gntblist.c:1943 ../gtk/gtkdialogs.c:677
+#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
 msgid "New Instant Message"
 msgstr "Nova Tuj Mesaĝo"
 
-#: ../console/gntblist.c:1945 ../gtk/gtkdialogs.c:679
+#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntblist.c:1948 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
-#: ../gtk/gtkdialogs.c:682 ../gtk/gtkdialogs.c:819 ../gtk/gtkdialogs.c:910
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
 #: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1388
-#: ../libgaim/protocols/oscar/oscar.c:2152
-#: ../libgaim/protocols/oscar/oscar.c:2239
-#: ../libgaim/protocols/oscar/oscar.c:5733
-#: ../libgaim/protocols/oscar/oscar.c:5937
-#: ../libgaim/protocols/oscar/oscar.c:5962
-#: ../libgaim/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
 #: ../libgaim/protocols/silc/buddy.c:466
 #: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
 #: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
 msgid "OK"
 msgstr "Daŭrigu"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:1967 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
 msgid "Options"
 msgstr "Opcioj"
 
-#: ../console/gntblist.c:1973
+#: ../console/gntblist.c:2045
 msgid "Send IM..."
 msgstr "Sendu TM-n..."
 
-#: ../console/gntblist.c:1977
+#: ../console/gntblist.c:2049
 msgid "Toggle offline buddies"
 msgstr "Inversigi senkonektajn kunulojn"
 
-#: ../console/gntblist.c:1981
+#: ../console/gntblist.c:2053
 msgid "Sort by status"
 msgstr "Ordigi laŭ stato"
 
-#: ../console/gntblist.c:1985
+#: ../console/gntblist.c:2057
 msgid "Sort alphabetically"
 msgstr "Ordigi alfabete"
 
-#: ../console/gntblist.c:1989
+#: ../console/gntblist.c:2061
 msgid "Sort by log size"
 msgstr "Oridgi laŭ protokolo grandeco"
 
@@ -543,117 +540,126 @@
 "%s estis diskonektigita pro la jena eraro:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
 #: ../libgaim/connection.c:107
 msgid "Connection Error"
 msgstr "Konekteraro"
 
-#: ../console/gntconv.c:71
+#: ../console/gntconv.c:102
 msgid "No such command."
 msgstr "Nenia komando."
 
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
 msgid "Your command failed for an unknown reason."
 msgstr "Via komanda malsukcesis pro nekonata kialo."
 
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
 msgid "That command only works in chats, not IMs."
 msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
 
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
 msgid "That command only works in IMs, not chats."
 msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
 
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
 msgid "That command doesn't work on this protocol."
 msgstr "Tiu komando ne funkcias je tiu protokolo."
 
-#: ../console/gntconv.c:99
+#: ../console/gntconv.c:130
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
 
-#: ../console/gntconv.c:198
+#: ../console/gntconv.c:232
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:219
+#: ../console/gntconv.c:255
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:349
+#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s tajpas..."
+
+#: ../console/gntconv.c:399
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTO-RESPONDO> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:443
+#: ../console/gntconv.c:501
 msgid "List of users:\n"
 msgstr "Uzantoj Listo:\n"
 
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "Subtenitaj sencimigopcioj estas:  versio"
 
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "Nenia komand (en tiu kunteksto)."
 
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6737
+#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6740
+#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6743
+#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6746
+#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6749
+#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../console/gntconv.c:661
+#: ../console/gntconv.c:719
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../console/gntconv.c:664
+#: ../console/gntconv.c:722
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../console/gntconv.c:667
+#: ../console/gntconv.c:725
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../console/gntconv.c:670
+#: ../console/gntconv.c:728
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../console/gntconv.c:673
+#: ../console/gntconv.c:731
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../console/gntconv.c:676
+#: ../console/gntconv.c:734
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
@@ -677,12 +683,12 @@
 msgid "Timestamps"
 msgstr "Tempomarkojn"
 
-#: ../console/gntgaim.c:166
+#: ../console/gntgaim.c:227
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Provu `%s -h' por plia informo.\n"
 
-#: ../console/gntgaim.c:168
+#: ../console/gntgaim.c:229
 #, c-format
 msgid ""
 "%s\n"
@@ -711,19 +717,18 @@
 msgid "You have mail!"
 msgstr "Vi ricevis retmesaĝon!"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
 msgid "From"
 msgstr "De"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
 msgid "Subject"
 msgstr "Subjekto"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
-#: ../libgaim/protocols/silc/util.c:377
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
 msgid "Close"
 msgstr "Fermu"
 
@@ -734,46 +739,45 @@
 msgstr[0] "%s (%s) havas %d novan mesaĝon."
 msgstr[1] "%s (%s) havas %d novajn mesaĝojn."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
 msgid "New Mail"
 msgstr "Nova Retmesaĝo"
 
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2612
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
 #, c-format
 msgid "Info for %s"
 msgstr "Informo pri %s"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
 #: ../libgaim/protocols/toc/toc.c:476
 msgid "Buddy Information"
 msgstr "Kunul Informo"
 
-#: ../console/gntnotify.c:303
+#: ../console/gntnotify.c:306
 msgid "Continue"
 msgstr "Daŭrigu"
 
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "Informo"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
 msgid "IM"
 msgstr "TM"
 
-#: ../console/gntnotify.c:315
+#: ../console/gntnotify.c:318
 msgid "Join"
 msgstr "Aliĝu"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3483
+#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
 msgid "Invite"
 msgstr "Invitu"
 
-#: ../console/gntnotify.c:321
+#: ../console/gntnotify.c:324
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../console/gntplugin.c:117
+#: ../console/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -790,27 +794,27 @@
 "Retejo: %s\n"
 "Dosiernomo: %s\n"
 
-#: ../console/gntplugin.c:170
+#: ../console/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Necesas ŝarĝi kromaĵon por agordi ĝin."
 
-#: ../console/gntplugin.c:208
+#: ../console/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:209
+#: ../console/gntplugin.c:194
 msgid "Still need to do something about this."
 msgstr ""
 
-#: ../console/gntplugin.c:215
+#: ../console/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "Neniuj agordaj opcioj por tiu kromaĵo."
 
-#: ../console/gntplugin.c:236
+#: ../console/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "Vi povas (mal)ŝarĝi kromaĵojn de la jena listo."
 
-#: ../console/gntplugin.c:279
+#: ../console/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "Agordu Kromaĵon"
 
@@ -847,17 +851,17 @@
 msgstr "Protokolu stato ŝanĝeventojn"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
 #: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
 msgstr "Konversacioj"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
 msgid "Logging"
 msgstr "Protokolado"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
-#: ../gtk/gtkprefs.c:1945
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "Agordo"
 
@@ -874,60 +878,60 @@
 msgid "Delete Status"
 msgstr "Forigu Staton"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
 msgid "Saved Statuses"
 msgstr "Konservitaj Statoj"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
 #: ../libgaim/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Titolon"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
 msgid "Type"
 msgstr "Tipo"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
-#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1598 ../libgaim/protocols/gg/gg.c:1608
-#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/gg/gg.c:1623
-#: ../libgaim/protocols/gg/gg.c:1628 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/jabber/jabber.c:1225
-#: ../libgaim/protocols/jabber/jabber.c:1235
-#: ../libgaim/protocols/jabber/jabber.c:1245
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
 #: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
 #: ../libgaim/protocols/novell/novell.c:2982
 #: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5397
-#: ../libgaim/protocols/oscar/oscar.c:5412
-#: ../libgaim/protocols/oscar/oscar.c:5417
-#: ../libgaim/protocols/oscar/oscar.c:5625
-#: ../libgaim/protocols/oscar/oscar.c:5637
-#: ../libgaim/protocols/oscar/oscar.c:5650
-#: ../libgaim/protocols/oscar/oscar.c:5657
-#: ../libgaim/protocols/oscar/oscar.c:5664
-#: ../libgaim/protocols/sametime/sametime.c:3297
-#: ../libgaim/protocols/sametime/sametime.c:3303
-#: ../libgaim/protocols/sametime/sametime.c:3309
-#: ../libgaim/protocols/sametime/sametime.c:3388
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
 #: ../libgaim/protocols/silc/buddy.c:1544
 #: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
 #: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/yahoo/yahoo.c:3462
-#: ../libgaim/protocols/zephyr/zephyr.c:2333
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
 msgid "Use"
 msgstr "Uzu"
 
@@ -947,50 +951,55 @@
 msgid "Please enter a different title for the status."
 msgstr "B.v. enigi malsimilan titolon por la stato."
 
-#: ../console/gntstatus.c:439
+#: ../console/gntstatus.c:440
 msgid "Substatus"
 msgstr "Substato"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
 msgid "Status:"
 msgstr "Stato"
 
-#: ../console/gntstatus.c:465
+#: ../console/gntstatus.c:466
 msgid "Message:"
 msgstr "Mesaĝo:"
 
-#: ../console/gntstatus.c:514
+#: ../console/gntstatus.c:515
 msgid "Edit Status"
 msgstr "Redaktu Staton"
 
-#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
-#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1581
-#: ../libgaim/protocols/gg/gg.c:1585 ../libgaim/protocols/jabber/buddy.c:623
-#: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../libgaim/protocols/novell/novell.c:2875
-#: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
 msgid "Status"
 msgstr "Stato"
 
-#: ../console/gntstatus.c:556
+#: ../console/gntstatus.c:557
 msgid "Use different status for following accounts"
 msgstr "Uzu malsimilan staton por jenaj kontoj"
 
 #. Save & Use
-#: ../console/gntstatus.c:590
+#: ../console/gntstatus.c:591
 msgid "Save & Use"
 msgstr "Konservu & Uzu"
 
@@ -1121,8 +1130,8 @@
 msgstr "_Alinomo"
 
 #. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
-#: ../gtk/gtkroomlist.c:442
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
 msgid "_Join"
 msgstr "_Aliĝu"
 
@@ -1130,7 +1139,7 @@
 msgid "Close _tabs"
 msgstr "Fermu _langetojn"
 
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
 msgid "I_M"
 msgstr "T_M"
 
@@ -1156,51 +1165,55 @@
 msgstr "_Paŭzo"
 
 #. Build the login options frame.
-#: ../gtk/gtkaccount.c:382
+#: ../gtk/gtkaccount.c:390
 msgid "Login Options"
 msgstr "Salutaj Opcioj"
 
-#: ../gtk/gtkaccount.c:483
+#: ../gtk/gtkaccount.c:492
 msgid "Local alias:"
 msgstr "Loka Alinomo:"
 
 #. Build the user options frame.
-#: ../gtk/gtkaccount.c:545
+#: ../gtk/gtkaccount.c:554
 msgid "User Options"
 msgstr "Uzantoopcioj"
 
 #. Buddy icon
-#: ../gtk/gtkaccount.c:563
+#: ../gtk/gtkaccount.c:572
 msgid "Use this buddy icon for this account:"
 msgstr "Uzu tiun kunul piktogramon por tiu konto:"
 
 #. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:671
+#: ../gtk/gtkaccount.c:684
 #, c-format
 msgid "%s Options"
 msgstr "%s Opcioj"
 
-#: ../gtk/gtkaccount.c:867
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
+
+#: ../gtk/gtkaccount.c:882
 msgid "Use Global Proxy Settings"
 msgstr "Uzu Sistemajn Prokurilo-Agordojn"
 
-#: ../gtk/gtkaccount.c:873
+#: ../gtk/gtkaccount.c:888
 msgid "No Proxy"
 msgstr "Sen Prokurilo"
 
-#: ../gtk/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:894
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../gtk/gtkaccount.c:885
+#: ../gtk/gtkaccount.c:900
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../gtk/gtkaccount.c:891
+#: ../gtk/gtkaccount.c:906
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Uzu Mediajn Agordojn"
 
@@ -1209,265 +1222,303 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:936
+#: ../gtk/gtkaccount.c:951
 msgid "If you look real closely"
 msgstr "Se vi rigardas sufiĉe proksime"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:939
+#: ../gtk/gtkaccount.c:954
 msgid "you can see the butterflies mating"
 msgstr "vi povas vidi la Zamenhofan barbon kreski"
 
-#: ../gtk/gtkaccount.c:960
+#: ../gtk/gtkaccount.c:975
 msgid "Proxy Options"
 msgstr "Prokurilo Opcioj"
 
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Prokurilo _tipo:"
 
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Retnodo:"
 
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../gtk/gtkaccount.c:995
+#: ../gtk/gtkaccount.c:1010
 msgid "_Username:"
 msgstr "_Salutnomo:"
 
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "Pa_svorto:"
 
-#: ../gtk/gtkaccount.c:1398
+#: ../gtk/gtkaccount.c:1428
 msgid "Add Account"
 msgstr "Aldonu Konton"
 
-#: ../gtk/gtkaccount.c:1422
+#: ../gtk/gtkaccount.c:1452
 msgid "_Basic"
 msgstr "_Baza"
 
-#: ../gtk/gtkaccount.c:1433
+#: ../gtk/gtkaccount.c:1463
 msgid "_Advanced"
 msgstr "_Kroma"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
 msgid "Register"
 msgstr "Registru"
 
-#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
 msgid "Enabled"
 msgstr "Enŝaltita"
 
-#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkaccount.c:1961
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../gtk/gtkblist.c:705
+#: ../gtk/gtkaccount.c:2133
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../gtk/gtkaccount.c:2483
+#, 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"
+
+#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "Permesi kunulon?"
+
+#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "Permesi"
+
+#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: ../gtk/gtkblist.c:709
 msgid "Join a Chat"
 msgstr "Aliĝu Babilejon"
 
-#: ../gtk/gtkblist.c:726
+#: ../gtk/gtkblist.c:730
 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"
 
-#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../gtk/gtkblist.c:1001
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Bloku"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "Mal_bloku"
+
+#: ../gtk/gtkblist.c:1066
 msgid "Get _Info"
 msgstr "Ricevu _Informon"
 
-#: ../gtk/gtkblist.c:1010
+#: ../gtk/gtkblist.c:1075
 msgid "_Send File"
 msgstr "_Sendu Dosieron"
 
-#: ../gtk/gtkblist.c:1017
+#: ../gtk/gtkblist.c:1082
 msgid "Add Buddy _Pounce"
 msgstr "Aldonu Kunul _Atentigon"
 
-#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
-#: ../gtk/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
 msgid "View _Log"
 msgstr "Montru Protoko_lon"
 
-#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1103
 msgid "Alias..."
 msgstr "Alinomo..."
 
-#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
+#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
 msgid "_Alias..."
 msgstr "_Alinomo..."
 
-#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
+#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
 msgid "_Remove"
 msgstr "Fo_rigu"
 
-#: ../gtk/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1161
 msgid "Add a _Buddy"
 msgstr "Aldonu K_unulon"
 
-#: ../gtk/gtkblist.c:1097
+#: ../gtk/gtkblist.c:1163
 msgid "Add a C_hat"
 msgstr "Aldonu Babile_jon"
 
-#: ../gtk/gtkblist.c:1100
+#: ../gtk/gtkblist.c:1166
 msgid "_Delete Group"
 msgstr "_Forigu Grupon"
 
-#: ../gtk/gtkblist.c:1102
+#: ../gtk/gtkblist.c:1168
 msgid "_Rename"
 msgstr "_Alinomu"
 
-#: ../gtk/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1188
 msgid "Auto-Join"
 msgstr "Aŭtomate-aliĝu"
 
-#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
+#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
 msgid "_Collapse"
 msgstr "_Maletendu"
 
-#: ../gtk/gtkblist.c:1188
+#: ../gtk/gtkblist.c:1254
 msgid "_Expand"
 msgstr "_Etendu"
 
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
-#: ../gtk/gtkblist.c:4125
+#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
 msgid "/Tools/Mute Sounds"
 msgstr "/Iloj/Mutu Sonojn"
 
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4350 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
 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
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2567
 msgid "/_Buddies"
 msgstr "/K_unuloj"
 
-#: ../gtk/gtkblist.c:2501
+#: ../gtk/gtkblist.c:2568
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
 
-#: ../gtk/gtkblist.c:2502
+#: ../gtk/gtkblist.c:2569
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kunuloj/Aliĝu Babile_jon..."
 
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2570
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
 
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2571
 msgid "/Buddies/View User _Log..."
 msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
 
-#: ../gtk/gtkblist.c:2506
+#: ../gtk/gtkblist.c:2573
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
 
-#: ../gtk/gtkblist.c:2507
+#: ../gtk/gtkblist.c:2574
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
 
-#: ../gtk/gtkblist.c:2508
+#: ../gtk/gtkblist.c:2575
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Kunuloj/Montru Kunul-_Detalojn"
 
-#: ../gtk/gtkblist.c:2509
+#: ../gtk/gtkblist.c:2576
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
 
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2577
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kunuloj/_Oridgu Kunulojn"
 
-#: ../gtk/gtkblist.c:2512
+#: ../gtk/gtkblist.c:2579
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kunuloj/_Aldonu Kunulon..."
 
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2580
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kunuloj/Aldonu Babile_jon..."
 
-#: ../gtk/gtkblist.c:2514
+#: ../gtk/gtkblist.c:2581
 msgid "/Buddies/Add _Group..."
 msgstr "/Kunuloj/Aldonu _Grupon..."
 
-#: ../gtk/gtkblist.c:2516
+#: ../gtk/gtkblist.c:2583
 msgid "/Buddies/_Quit"
 msgstr "/Kunuloj/_Finu"
 
 #. Accounts menu
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2586
 msgid "/_Accounts"
 msgstr "/_Kontoj"
 
-#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
+#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontoj/Aldonu\\/Redaktu"
 
 #. Tools
-#: ../gtk/gtkblist.c:2523
+#: ../gtk/gtkblist.c:2590
 msgid "/_Tools"
 msgstr "/_Iloj"
 
-#: ../gtk/gtkblist.c:2524
+#: ../gtk/gtkblist.c:2591
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Iloj/Kunul _Atentigoj"
 
-#: ../gtk/gtkblist.c:2525
+#: ../gtk/gtkblist.c:2592
 msgid "/Tools/Plu_gins"
 msgstr "/Iloj/Kromaĵoj"
 
-#: ../gtk/gtkblist.c:2526
+#: ../gtk/gtkblist.c:2593
 msgid "/Tools/Pr_eferences"
 msgstr "/Iloj/Agordoj"
 
-#: ../gtk/gtkblist.c:2527
+#: ../gtk/gtkblist.c:2594
 msgid "/Tools/Pr_ivacy"
 msgstr "/Iloj/Pr_ivateco"
 
-#: ../gtk/gtkblist.c:2529
+#: ../gtk/gtkblist.c:2596
 msgid "/Tools/_File Transfers"
 msgstr "/Iloj/_Dosiero-alŝutoj"
 
-#: ../gtk/gtkblist.c:2530
+#: ../gtk/gtkblist.c:2597
 msgid "/Tools/R_oom List"
 msgstr "/Iloj/Ĉambro-Listo"
 
-#: ../gtk/gtkblist.c:2531
+#: ../gtk/gtkblist.c:2598
 msgid "/Tools/System _Log"
 msgstr "/Iloj/Sistemo-_Protokolo"
 
-#: ../gtk/gtkblist.c:2533
+#: ../gtk/gtkblist.c:2600
 msgid "/Tools/Mute _Sounds"
 msgstr "/Iloj/Mutu _Sonojn"
 
 #. Help
-#: ../gtk/gtkblist.c:2536
+#: ../gtk/gtkblist.c:2603
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../gtk/gtkblist.c:2537
+#: ../gtk/gtkblist.c:2604
 msgid "/Help/Online _Help"
 msgstr "/Helpo/Reta _Helpo"
 
-#: ../gtk/gtkblist.c:2538
+#: ../gtk/gtkblist.c:2605
 msgid "/Help/_Debug Window"
 msgstr "/Helpo/_Sencimig-fenestro"
 
-#: ../gtk/gtkblist.c:2539
+#: ../gtk/gtkblist.c:2606
 msgid "/Help/_About"
 msgstr "/Helpo/_Pri"
 
-#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -1476,219 +1527,188 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../gtk/gtkblist.c:2652
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Kunul Alinomo:</b> %s"
-
-#: ../gtk/gtkblist.c:2664
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Karesnamo:</b> %s"
-
-#: ../gtk/gtkblist.c:2673
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Ensalutita En:</b> %s"
-
-#: ../gtk/gtkblist.c:2684
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Senfara:</b> %s"
-
-#: ../gtk/gtkblist.c:2719
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Laste vidita:</b> antaŭ %s"
-
-#: ../gtk/gtkblist.c:2728
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Stato:</b> Senkonekta"
-
-#: ../gtk/gtkblist.c:2739
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>Priskribo:</b> Timiga"
-
-#: ../gtk/gtkblist.c:2741
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "Kunul Alinomo"
 
 #: ../gtk/gtkblist.c:2743
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
-#: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5447
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Logged In"
+msgstr "Ensalutita"
+
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "Laste Vidita"
+
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../gtk/gtkblist.c:3226
+#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "Priskibo"
+
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr ""
+
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr ""
+
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr ""
+
+#: ../gtk/gtkblist.c:3302
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Senfara %dh %02dm"
 
-#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkblist.c:3304
 #, c-format
 msgid "Idle %dm"
 msgstr "Senfara %dm"
 
-#. Idle stuff
-#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1801
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2826
-#: ../libgaim/protocols/yahoo/yahoo.c:2881
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Senfara"
-
-#: ../gtk/gtkblist.c:3359
+#: ../gtk/gtkblist.c:3435
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
 
-#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
+#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kunuloj/Aliĝu Babilejon..."
 
-#: ../gtk/gtkblist.c:3361
+#: ../gtk/gtkblist.c:3437
 msgid "/Buddies/Get User Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
 
-#: ../gtk/gtkblist.c:3362
+#: ../gtk/gtkblist.c:3438
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kunuloj/Aldonu Kunulon..."
 
-#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
+#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
 msgid "/Buddies/Add Chat..."
 msgstr "/Kunuloj/Aldonu Babilejon..."
 
-#: ../gtk/gtkblist.c:3364
+#: ../gtk/gtkblist.c:3440
 msgid "/Buddies/Add Group..."
 msgstr "/Kunuloj/Aldonu Grupon..."
 
-#: ../gtk/gtkblist.c:3399
+#: ../gtk/gtkblist.c:3475
 msgid "/Tools/Buddy Pounces"
 msgstr "/Iloj/Kunul Atentigoj"
 
-#: ../gtk/gtkblist.c:3402
+#: ../gtk/gtkblist.c:3478
 msgid "/Tools/Privacy"
 msgstr "/Iloj/Privateco"
 
-#: ../gtk/gtkblist.c:3405
+#: ../gtk/gtkblist.c:3481
 msgid "/Tools/Room List"
 msgstr "/Iloj/Ĉambro Listo"
 
-#: ../gtk/gtkblist.c:3501 ../gtk/gtkdocklet.c:149
+#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d nelegita mesaĝo el %s\n"
 msgstr[1] "%d nelegitaj mesaĝoj el %s\n"
 
-#: ../gtk/gtkblist.c:3577
+#: ../gtk/gtkblist.c:3654
 msgid "Manually"
 msgstr "Mane"
 
-#: ../gtk/gtkblist.c:3579
+#: ../gtk/gtkblist.c:3656
 msgid "Alphabetically"
 msgstr "Alfabete"
 
-#: ../gtk/gtkblist.c:3580
+#: ../gtk/gtkblist.c:3657
 msgid "By status"
 msgstr "Laŭ stato"
 
-#: ../gtk/gtkblist.c:3581
+#: ../gtk/gtkblist.c:3658
 msgid "By log size"
 msgstr "Laŭ protokolo grandeco"
 
-#: ../gtk/gtkblist.c:3789 ../gtk/gtkconn.c:178
+#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s malkontaktita"
 
-#: ../gtk/gtkblist.c:3798 ../libgaim/protocols/sametime/sametime.c:3653
+#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
 msgid "Connect"
 msgstr "Kontaktu"
 
-#: ../gtk/gtkblist.c:3798
+#: ../gtk/gtkblist.c:3869
 msgid "Re-enable Account"
 msgstr "Reŝaltu Konton"
 
-#: ../gtk/gtkblist.c:3819
+#: ../gtk/gtkblist.c:3890
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s malkontaktita: %s</span>"
 
-#: ../gtk/gtkblist.c:3948
+#: ../gtk/gtkblist.c:4027
+msgid "<b>Username:</b>"
+msgstr "<b>_Uzantonomo:</b>"
+
+#: ../gtk/gtkblist.c:4034
+msgid "<b>Password:</b>"
+msgstr "<b>Pasvorton:</b>"
+
+#: ../gtk/gtkblist.c:4045
+msgid "_Login"
+msgstr "Sa_lutnomo"
+
+#: ../gtk/gtkblist.c:4127
 msgid "/Accounts"
 msgstr "/Kontoj"
 
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../gtk/gtkblist.c:4141
+msgid ""
+"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../gtk/gtkblist.c:4109
+#: ../gtk/gtkblist.c:4368
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kunuloj/Montru Senkonektajn Kunulojn"
 
-#: ../gtk/gtkblist.c:4112
+#: ../gtk/gtkblist.c:4371
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kunuloj/Montru Malplenajn Grupojn"
 
-#: ../gtk/gtkblist.c:4118
+#: ../gtk/gtkblist.c:4377
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Kunulojn/Montru Kunul-Detalojn"
 
-#: ../gtk/gtkblist.c:4121
+#: ../gtk/gtkblist.c:4380
 msgid "/Buddies/Show Idle Times"
 msgstr "/Kunuloj/Montru Senfarajn Tempojn"
 
-#: ../gtk/gtkblist.c:4786 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
 #: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
 #: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:67
+#: ../libgaim/protocols/jabber/roster.c:68
 msgid "Buddies"
 msgstr "Kunuloj"
 
-#: ../gtk/gtkblist.c:4920
+#: ../gtk/gtkblist.c:5207
 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. "
@@ -1698,23 +1718,23 @@
 "kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la kunul. "
 "La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
 
-#: ../gtk/gtkblist.c:4980 ../gtk/gtkblist.c:5343
+#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../gtk/gtkblist.c:5241
+#: ../gtk/gtkblist.c:5526
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../gtk/gtkblist.c:5257
+#: ../gtk/gtkblist.c:5542
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../gtk/gtkblist.c:5298
+#: ../gtk/gtkblist.c:5583
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -1722,31 +1742,39 @@
 "B.v. enigi alinomon, kaj la konvenan informon pri la babilejo kiun vi volas "
 "aldoni en via kunullisto.\n"
 
-#: ../gtk/gtkblist.c:5381
+#: ../gtk/gtkblist.c:5666
 msgid "Please enter the name of the group to be added."
 msgstr "B.v. enigi la nomon de la grupo aldonenda."
 
-#: ../gtk/gtkblist.c:6007
+#: ../gtk/gtkblist.c:6299
+msgid "<GaimMain>/Accounts/"
+msgstr "<GaimMain>/Kontoj/"
+
+#: ../gtk/gtkblist.c:6324
 msgid "_Edit Account"
 msgstr "_Redaktu Konton"
 
-#: ../gtk/gtkblist.c:6040 ../gtk/gtkblist.c:6046 ../gtk/gtkconv.c:2839
+#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
 
-#: ../gtk/gtkblist.c:6054
+#: ../gtk/gtkblist.c:6371
 msgid "_Disable"
 msgstr "_Malŝaltu"
 
-#: ../gtk/gtkblist.c:6066
+#: ../gtk/gtkblist.c:6383
 msgid "Enable Account"
 msgstr "Ŝaltu Konton"
 
-#: ../gtk/gtkblist.c:6119
+#: ../gtk/gtkblist.c:6389
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../gtk/gtkblist.c:6438
 msgid "/Tools"
 msgstr "/Iloj"
 
-#: ../gtk/gtkblist.c:6205
+#: ../gtk/gtkblist.c:6508
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kunuloj/Ordigu Kunulojn"
 
@@ -1759,20 +1787,20 @@
 "and re-enable the account."
 msgstr ""
 
-#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
+#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../gtk/gtkconv.c:766
+#: ../gtk/gtkconv.c:786
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../gtk/gtkconv.c:819
+#: ../gtk/gtkconv.c:839
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitu Kunul En Babilejo"
 
 #. Put our happy label in it.
-#: ../gtk/gtkconv.c:849
+#: ../gtk/gtkconv.c:869
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -1780,188 +1808,188 @@
 "B.v. enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
 "invitmesaĝon."
 
-#: ../gtk/gtkconv.c:870
+#: ../gtk/gtkconv.c:890
 msgid "_Buddy:"
 msgstr "K_unul:"
 
-#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
-#: ../gtk/gtksavedstatuses.c:1447
+#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
+#: ../gtk/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Mesaĝo:"
 
-#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
 #: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Dosiero malfermeblas."
 
-#: ../gtk/gtkconv.c:953
+#: ../gtk/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konversacio kun %s</h1>\n"
 
-#: ../gtk/gtkconv.c:977
+#: ../gtk/gtkconv.c:997
 msgid "Save Conversation"
 msgstr "Konservu Konversacion"
 
-#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
+#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Trovu"
 
-#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
+#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Serĉu:"
 
-#: ../gtk/gtkconv.c:1321
+#: ../gtk/gtkconv.c:1341
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 
-#: ../gtk/gtkconv.c:1329
+#: ../gtk/gtkconv.c:1349
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 
-#: ../gtk/gtkconv.c:1597
+#: ../gtk/gtkconv.c:1617
 msgid "Un-Ignore"
 msgstr "Malignoru"
 
-#: ../gtk/gtkconv.c:1600
+#: ../gtk/gtkconv.c:1620
 msgid "Ignore"
 msgstr "Ignoru"
 
-#: ../gtk/gtkconv.c:1620
+#: ../gtk/gtkconv.c:1640
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-#: ../gtk/gtkconv.c:1643
+#: ../gtk/gtkconv.c:1663
 msgid "Last said"
 msgstr "Laste diris"
 
-#: ../gtk/gtkconv.c:2408
+#: ../gtk/gtkconv.c:2428
 msgid "Unable to save icon file to disk."
 msgstr "Ne eblas konservi piktogramodosieron al disko."
 
-#: ../gtk/gtkconv.c:2479
+#: ../gtk/gtkconv.c:2498
 msgid "Save Icon"
 msgstr "Konservu Piktogramon"
 
-#: ../gtk/gtkconv.c:2528
+#: ../gtk/gtkconv.c:2547
 msgid "Animate"
 msgstr "Animaciigi"
 
-#: ../gtk/gtkconv.c:2533
+#: ../gtk/gtkconv.c:2552
 msgid "Hide Icon"
 msgstr "Kaŝu Piktogramon"
 
-#: ../gtk/gtkconv.c:2536
+#: ../gtk/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Konservu Piktogramon Kiel..."
 
-#: ../gtk/gtkconv.c:2540
+#: ../gtk/gtkconv.c:2559
 msgid "Set Custom Icon..."
 msgstr "Difinu Propran Piktogramon..."
 
-#: ../gtk/gtkconv.c:2547
+#: ../gtk/gtkconv.c:2566
 msgid "Remove Custom Icon"
 msgstr "Forigu Propran Piktogramon"
 
 #. Conversation menu
-#: ../gtk/gtkconv.c:2688
+#: ../gtk/gtkconv.c:2707
 msgid "/_Conversation"
 msgstr "/_Konversacio"
 
-#: ../gtk/gtkconv.c:2690
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversacio/Nova Tuj _Mesaĝo..."
 
-#: ../gtk/gtkconv.c:2695
+#: ../gtk/gtkconv.c:2714
 msgid "/Conversation/_Find..."
 msgstr "/Konversacio/_Trovu..."
 
-#: ../gtk/gtkconv.c:2697
+#: ../gtk/gtkconv.c:2716
 msgid "/Conversation/View _Log"
 msgstr "/Konversacio/Montru _Protokolon"
 
-#: ../gtk/gtkconv.c:2698
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Save As..."
 msgstr "/Konversacio/_Konservu Kiel..."
 
-#: ../gtk/gtkconv.c:2700
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversacio/Fo_rviŝu Dialogon"
 
-#: ../gtk/gtkconv.c:2704
+#: ../gtk/gtkconv.c:2723
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
 
-#: ../gtk/gtkconv.c:2705
+#: ../gtk/gtkconv.c:2724
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
 
-#: ../gtk/gtkconv.c:2707
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/_Get Info"
 msgstr "/Konversatio/_Ricevu Informon"
 
-#: ../gtk/gtkconv.c:2709
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/In_vite..."
 msgstr "/Konversacio/In_vitu..."
 
-#: ../gtk/gtkconv.c:2711
+#: ../gtk/gtkconv.c:2730
 msgid "/Conversation/M_ore"
 msgstr "/Konversacio/_Pli"
 
-#: ../gtk/gtkconv.c:2715
+#: ../gtk/gtkconv.c:2734
 msgid "/Conversation/Al_ias..."
 msgstr "/Konversacio/Al_inomo..."
 
-#: ../gtk/gtkconv.c:2717
+#: ../gtk/gtkconv.c:2736
 msgid "/Conversation/_Block..."
 msgstr "/KConversacio/_Bloku..."
 
-#: ../gtk/gtkconv.c:2719
+#: ../gtk/gtkconv.c:2738
 msgid "/Conversation/_Add..."
 msgstr "/Konversacio/_Aldonu..."
 
-#: ../gtk/gtkconv.c:2721
+#: ../gtk/gtkconv.c:2740
 msgid "/Conversation/_Remove..."
 msgstr "/Konversacio/_Forigu..."
 
-#: ../gtk/gtkconv.c:2726
+#: ../gtk/gtkconv.c:2745
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konversacio/Enmetu Ligi_lon..."
 
-#: ../gtk/gtkconv.c:2728
+#: ../gtk/gtkconv.c:2747
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konversacio/Enm_etu Bildon..."
 
-#: ../gtk/gtkconv.c:2733
+#: ../gtk/gtkconv.c:2752
 msgid "/Conversation/_Close"
 msgstr "/Konversacio/_Fermu"
 
 #. Options
-#: ../gtk/gtkconv.c:2737
+#: ../gtk/gtkconv.c:2756
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../gtk/gtkconv.c:2738
+#: ../gtk/gtkconv.c:2757
 msgid "/Options/Enable _Logging"
 msgstr "/Opcioj/Ŝaltu _Protokoladon"
 
-#: ../gtk/gtkconv.c:2739
+#: ../gtk/gtkconv.c:2758
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcioj/Ŝaltu _Sonojn"
 
-#: ../gtk/gtkconv.c:2740
+#: ../gtk/gtkconv.c:2759
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcioj/Montru Kunul-P_iktogramon"
 
-#: ../gtk/gtkconv.c:2742
+#: ../gtk/gtkconv.c:2761
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcioj/Montru Formato-_Illistelojn"
 
-#: ../gtk/gtkconv.c:2743
+#: ../gtk/gtkconv.c:2762
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcioj/Montru Te_mpomarkojn"
 
-#: ../gtk/gtkconv.c:2818
+#: ../gtk/gtkconv.c:2837
 msgid "/Conversation/More"
 msgstr "/Konversacio/Pli"
 
@@ -1970,172 +1998,172 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
+#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
 msgid "/Conversation"
 msgstr "/Konversacio"
 
-#: ../gtk/gtkconv.c:2903
+#: ../gtk/gtkconv.c:2922
 msgid "/Conversation/View Log"
 msgstr "/Konversacio/Montru Protokoladon"
 
-#: ../gtk/gtkconv.c:2909
+#: ../gtk/gtkconv.c:2928
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
 
-#: ../gtk/gtkconv.c:2913
+#: ../gtk/gtkconv.c:2932
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
 
-#: ../gtk/gtkconv.c:2919
+#: ../gtk/gtkconv.c:2938
 msgid "/Conversation/Get Info"
 msgstr "/Konversacio/Ricevu Informon"
 
-#: ../gtk/gtkconv.c:2923
+#: ../gtk/gtkconv.c:2942
 msgid "/Conversation/Invite..."
 msgstr "/Konversacio/Invitu..."
 
-#: ../gtk/gtkconv.c:2929
+#: ../gtk/gtkconv.c:2948
 msgid "/Conversation/Alias..."
 msgstr "/Konversacio/Alinomo..."
 
-#: ../gtk/gtkconv.c:2933
+#: ../gtk/gtkconv.c:2952
 msgid "/Conversation/Block..."
 msgstr "/Konversacio/Bloku..."
 
-#: ../gtk/gtkconv.c:2937
+#: ../gtk/gtkconv.c:2956
 msgid "/Conversation/Add..."
 msgstr "/Konversacion/Aldonu..."
 
-#: ../gtk/gtkconv.c:2941
+#: ../gtk/gtkconv.c:2960
 msgid "/Conversation/Remove..."
 msgstr "/Konversacio/Forigu..."
 
-#: ../gtk/gtkconv.c:2947
+#: ../gtk/gtkconv.c:2966
 msgid "/Conversation/Insert Link..."
 msgstr "/Konversacio/Enmetu Ligilon..."
 
-#: ../gtk/gtkconv.c:2951
+#: ../gtk/gtkconv.c:2970
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversacio/Enmetu Bildon..."
 
-#: ../gtk/gtkconv.c:2957
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Enable Logging"
 msgstr "/Opcioj/Ŝaltu Protokoladon"
 
-#: ../gtk/gtkconv.c:2960
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Enable Sounds"
 msgstr "/Opcioj/Ŝaltu Sonojn"
 
-#: ../gtk/gtkconv.c:2973
+#: ../gtk/gtkconv.c:2992
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcioj/Montru Formato-Illistelojn"
 
-#: ../gtk/gtkconv.c:2976
+#: ../gtk/gtkconv.c:2995
 msgid "/Options/Show Timestamps"
 msgstr "/Opcioj/Montru Tempomarkojn"
 
-#: ../gtk/gtkconv.c:2979
+#: ../gtk/gtkconv.c:2998
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcioj/Montru Kunul-Piktogramon"
 
-#: ../gtk/gtkconv.c:3055
+#: ../gtk/gtkconv.c:3074
 msgid "User is typing..."
 msgstr "Uzanto tajpas..."
 
-#: ../gtk/gtkconv.c:3058
+#: ../gtk/gtkconv.c:3077
 msgid "User has typed something and stopped"
 msgstr "Uzanto tajpis ion kaj haltis"
 
 #. Build the Send To menu
-#: ../gtk/gtkconv.c:3241
+#: ../gtk/gtkconv.c:3260
 msgid "_Send To"
 msgstr "_Sendu Al"
 
-#: ../gtk/gtkconv.c:3948
+#: ../gtk/gtkconv.c:3967
 msgid "_Send"
 msgstr "_Sendu"
 
-#: ../gtk/gtkconv.c:4002 ../libgaim/protocols/sametime/sametime.c:3595
+#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
 msgid "Topic:"
 msgstr "Temo:"
 
 #. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4054
+#: ../gtk/gtkconv.c:4115
 msgid "0 people in room"
 msgstr "0 homo en ĉambro"
 
-#: ../gtk/gtkconv.c:5101 ../gtk/gtkconv.c:5222
+#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
 #, 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"
 
-#: ../gtk/gtkconv.c:5775 ../gtk/gtkstatusbox.c:541
+#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
 msgid "Typing"
 msgstr "Tajpante"
 
-#: ../gtk/gtkconv.c:5781
+#: ../gtk/gtkconv.c:5861
 msgid "Stopped Typing"
 msgstr "Ekmaltajpas"
 
-#: ../gtk/gtkconv.c:5786
+#: ../gtk/gtkconv.c:5866
 msgid "Nick Said"
 msgstr "Karesnomo Diris"
 
-#: ../gtk/gtkconv.c:5791 ../gtk/gtkdocklet.c:500
+#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../gtk/gtkconv.c:5796
+#: ../gtk/gtkconv.c:5876
 msgid "New Event"
 msgstr "Nova Evento"
 
-#: ../gtk/gtkconv.c:6910
+#: ../gtk/gtkconv.c:6997
 msgid "Confirm close"
 msgstr "Konfirmu fermon"
 
-#: ../gtk/gtkconv.c:6942
+#: ../gtk/gtkconv.c:7029
 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?"
 
-#: ../gtk/gtkconv.c:7477
+#: ../gtk/gtkconv.c:7564
 msgid "Close other tabs"
 msgstr "Fermu aliajn langetojn"
 
-#: ../gtk/gtkconv.c:7483
+#: ../gtk/gtkconv.c:7570
 msgid "Close all tabs"
 msgstr "Fermu ĉiujn langetojn"
 
-#: ../gtk/gtkconv.c:7491
+#: ../gtk/gtkconv.c:7578
 msgid "Detach this tab"
 msgstr "Deigu tiun langeton"
 
-#: ../gtk/gtkconv.c:7497
+#: ../gtk/gtkconv.c:7584
 msgid "Close this tab"
 msgstr "Fermu tiun langeton"
 
-#: ../gtk/gtkconv.c:7765
+#: ../gtk/gtkconv.c:7855
 msgid "Close conversation"
 msgstr "Fermu konversacion"
 
-#: ../gtk/gtkconv.c:8229
+#: ../gtk/gtkconv.c:8319
 msgid "Last created window"
 msgstr "Lasta kreita fenestro"
 
-#: ../gtk/gtkconv.c:8231
+#: ../gtk/gtkconv.c:8321
 msgid "Separate IM and Chat windows"
 msgstr "Disigu TM-aj kaj Babilejajn fenestrojn"
 
-#: ../gtk/gtkconv.c:8233 ../gtk/gtkprefs.c:1297
+#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
 msgid "New window"
 msgstr "Nova fenestro"
 
-#: ../gtk/gtkconv.c:8235
+#: ../gtk/gtkconv.c:8325
 msgid "By group"
 msgstr "Laŭ grupo"
 
-#: ../gtk/gtkconv.c:8237
+#: ../gtk/gtkconv.c:8327
 msgid "By account"
 msgstr "Laŭ konto"
 
@@ -2252,7 +2280,7 @@
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
 msgid "Bulgarian"
 msgstr "Bulgara"
 
@@ -2264,7 +2292,7 @@
 msgid "Bosnian"
 msgstr "Bosna"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
 msgid "Catalan"
 msgstr "Kataluna"
 
@@ -2272,7 +2300,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valenciana"
 
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
 msgid "Czech"
 msgstr "Ĉeĥa"
 
@@ -2280,250 +2308,254 @@
 msgid "Danish"
 msgstr "Dana"
 
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
 msgid "German"
 msgstr "Germana"
 
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
+msgid "Dzongkha"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
 msgid "Greek"
 msgstr "Greka"
 
-#: ../gtk/gtkdialogs.c:131
-msgid "Australian English"
-msgstr "Aŭstrala Angla"
-
-#: ../gtk/gtkdialogs.c:132
-msgid "Canadian English"
-msgstr "Kanada Angla"
-
-#: ../gtk/gtkdialogs.c:133
-msgid "British English"
-msgstr "Brita Angla"
-
 #: ../gtk/gtkdialogs.c:134
+msgid "Australian English"
+msgstr "Aŭstrala Angla"
+
+#: ../gtk/gtkdialogs.c:135
+msgid "Canadian English"
+msgstr "Kanada Angla"
+
+#: ../gtk/gtkdialogs.c:136
+msgid "British English"
+msgstr "Brita Angla"
+
+#: ../gtk/gtkdialogs.c:137
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
-#: ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
 msgid "Euskera(Basque)"
 msgstr "Eŭska"
 
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
 msgid "Persian"
 msgstr "Persa"
 
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:198 ../gtk/gtkdialogs.c:199
-#: ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
 msgid "French"
 msgstr "Franca"
 
-#: ../gtk/gtkdialogs.c:143
+#: ../gtk/gtkdialogs.c:146
 msgid "Galician"
 msgstr "Galega"
 
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
 msgid "Gujarati"
 msgstr "Guĝarata"
 
-#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../gtk/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:150
 msgid "Hindi"
 msgstr "Hindia"
 
-#: ../gtk/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:151
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
 msgid "Italian"
 msgstr "Itala"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:204 ../gtk/gtkdialogs.c:205
-#: ../gtk/gtkdialogs.c:206
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
 msgid "Korean"
 msgstr "Korea"
 
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
 msgid "Kurdish"
 msgstr "Kurda"
 
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:160
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: ../gtk/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:161
 msgid "Nepali"
 msgstr "Nepala"
 
-#: ../gtk/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:162
 msgid "Dutch, Flemish"
 msgstr "Nederlanda, Flandra"
 
-#: ../gtk/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:163
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:162 ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
 msgid "Polish"
 msgstr "Pola"
 
-#: ../gtk/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:166
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../gtk/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:167
 msgid "Portuguese-Brazil"
 msgstr "Brazil-Portugala"
 
-#: ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:168
 msgid "Romanian"
 msgstr "Rumana"
 
-#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
 msgid "Serbian"
 msgstr "Serba"
 
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:214
+#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../gtk/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:174
 msgid "Albanian"
 msgstr "Albana"
 
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:216
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:176
 msgid "Tamil"
 msgstr "Tamila"
 
-#: ../gtk/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:177
 msgid "Telugu"
 msgstr "Telugua"
 
-#: ../gtk/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:178
 msgid "Thai"
 msgstr "Taja"
 
-#: ../gtk/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:179
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../gtk/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:180
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../gtk/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:180
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh kaj la Gnome-Vi Teamo"
 
-#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:217
+#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
 msgid "Simplified Chinese"
 msgstr "Simpligita Ĉina"
 
-#: ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:180 ../gtk/gtkdialogs.c:218
+#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
 msgid "Traditional Chinese"
 msgstr "Tradicia Ĉina"
 
-#: ../gtk/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:189
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../gtk/gtkdialogs.c:299
+#: ../gtk/gtkdialogs.c:301
 msgid "About Gaim"
 msgstr "Pri Gaim"
 
-#: ../gtk/gtkdialogs.c:333
+#: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with Gaim.  Gaim is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
+"<BR><BR>You may modify and redistribute the program under the terms of the "
+"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
+"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
+"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
-"IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu kaj QQ ĉiujn "
-"samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi rajtas modifi kaj "
-"pludistribui la programon je la kondiĉoj de la GPL (versio 2 aŭ posta).  "
-"Ekzempleron de la GPL-o enhavas la dosiero 'COPYING' disdonita kun Gaim.  "
-"Gaim estas aŭtorrajtigita de kontribuantoj.  Vidu la dosieron 'COPYRIGHT' "
-"pri kompleta listo de kontribuantoj.  Ni provizas nenian garantion pri tiu "
-"programaro.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:348
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
+"Gadu kaj QQ ĉiujn samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi rajtas "
+"modifi kaj pludistribui la programon je la kondiĉoj de la GPL (versio 2 aŭ "
+"posta).  Ekzempleron de la GPL-o enhavas la dosiero 'COPYING' disdonita kun "
+"Gaim.  Gaim estas aŭtorrajtigita de kontribuantoj.  Vidu la dosieron "
+"'COPYRIGHT' pri kompleta listo de kontribuantoj.  Ni provizas nenian "
+"garantion pri tiu programaro.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim ĉe irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:351
+#: ../gtk/gtkdialogs.c:353
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim ĉe irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:357
+#: ../gtk/gtkdialogs.c:359
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
 
-#: ../gtk/gtkdialogs.c:372
+#: ../gtk/gtkdialogs.c:374
 msgid "Crazy Patch Writers"
 msgstr "Frenezaj Flikistoj"
 
-#: ../gtk/gtkdialogs.c:387
+#: ../gtk/gtkdialogs.c:389
 msgid "Retired Developers"
 msgstr "Emeritaj Programistoj"
 
-#: ../gtk/gtkdialogs.c:402
+#: ../gtk/gtkdialogs.c:404
 msgid "Current Translators"
 msgstr "Aktualaj Tradukantoj"
 
-#: ../gtk/gtkdialogs.c:422
+#: ../gtk/gtkdialogs.c:424
 msgid "Past Translators"
 msgstr "Pastintaj Tradukantoj"
 
-#: ../gtk/gtkdialogs.c:440
+#: ../gtk/gtkdialogs.c:442
 msgid "Debugging Information"
 msgstr "Sencimiga Informo"
 
-#: ../gtk/gtkdialogs.c:814
+#: ../gtk/gtkdialogs.c:816
 msgid "Get User Info"
 msgstr "Ricevu Uzanto-Informon"
 
-#: ../gtk/gtkdialogs.c:816
+#: ../gtk/gtkdialogs.c:818
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -2531,11 +2563,11 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
 "rigardi."
 
-#: ../gtk/gtkdialogs.c:905
+#: ../gtk/gtkdialogs.c:907
 msgid "View User Log"
 msgstr "Rigardu Uzanto-Protokolon"
 
-#: ../gtk/gtkdialogs.c:907
+#: ../gtk/gtkdialogs.c:909
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -2543,32 +2575,32 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi dezrias "
 "rigardi."
 
-#: ../gtk/gtkdialogs.c:926
+#: ../gtk/gtkdialogs.c:928
 msgid "Alias Contact"
 msgstr "Alinomo Kontakto"
 
-#: ../gtk/gtkdialogs.c:927
+#: ../gtk/gtkdialogs.c:929
 msgid "Enter an alias for this contact."
 msgstr "Enigu alinomon por tiu kontakto."
 
-#: ../gtk/gtkdialogs.c:947
+#: ../gtk/gtkdialogs.c:949
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enigu alinomon por %s."
 
-#: ../gtk/gtkdialogs.c:949
+#: ../gtk/gtkdialogs.c:951
 msgid "Alias Buddy"
 msgstr "Alinomu Kunulon"
 
-#: ../gtk/gtkdialogs.c:968
+#: ../gtk/gtkdialogs.c:970
 msgid "Alias Chat"
 msgstr "Alinomu Babilejon"
 
-#: ../gtk/gtkdialogs.c:969
+#: ../gtk/gtkdialogs.c:971
 msgid "Enter an alias for this chat."
 msgstr "Enigu alinomon por tiu babilejon."
 
-#: ../gtk/gtkdialogs.c:1006
+#: ../gtk/gtkdialogs.c:1008
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -2583,15 +2615,15 @@
 "Vi estas foriganta la kontaktojn enhavantajn %s kaj %d aliaj kunuloj de via "
 "kunullisto. Ĉu vi volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1014
+#: ../gtk/gtkdialogs.c:1016
 msgid "Remove Contact"
 msgstr "Forigu Kontakton"
 
-#: ../gtk/gtkdialogs.c:1015
+#: ../gtk/gtkdialogs.c:1017
 msgid "_Remove Contact"
 msgstr "_Forigu Kontakton"
 
-#: ../gtk/gtkdialogs.c:1045
+#: ../gtk/gtkdialogs.c:1047
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -2600,15 +2632,15 @@
 "Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. Ĉu vi volas "
 "daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1052
+#: ../gtk/gtkdialogs.c:1054
 msgid "Merge Groups"
 msgstr "Kunfandu Grupojn"
 
-#: ../gtk/gtkdialogs.c:1053
+#: ../gtk/gtkdialogs.c:1055
 msgid "_Merge Groups"
 msgstr "_Kunfandu Grupojn"
 
-#: ../gtk/gtkdialogs.c:1103
+#: ../gtk/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -2617,102 +2649,102 @@
 "Vi estas foriganta la grupon %s kaj tutajn membrojn de via kunullisto. Ĉu vi "
 "volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1106
+#: ../gtk/gtkdialogs.c:1108
 msgid "Remove Group"
 msgstr "Forigu Grupon"
 
-#: ../gtk/gtkdialogs.c:1107
+#: ../gtk/gtkdialogs.c:1109
 msgid "_Remove Group"
 msgstr "_Forigu Grupon"
 
-#: ../gtk/gtkdialogs.c:1140
+#: ../gtk/gtkdialogs.c:1142
 #, 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?"
 
-#: ../gtk/gtkdialogs.c:1143
+#: ../gtk/gtkdialogs.c:1145
 msgid "Remove Buddy"
 msgstr "Forigu Kunulon"
 
-#: ../gtk/gtkdialogs.c:1144
+#: ../gtk/gtkdialogs.c:1146
 msgid "_Remove Buddy"
 msgstr "_Forigu Kunulon"
 
-#: ../gtk/gtkdialogs.c:1165
+#: ../gtk/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1168
+#: ../gtk/gtkdialogs.c:1170
 msgid "Remove Chat"
 msgstr "Forigu Babilejon"
 
-#: ../gtk/gtkdialogs.c:1169
+#: ../gtk/gtkdialogs.c:1171
 msgid "_Remove Chat"
 msgstr "_Forigu Babilejon"
 
-#: ../gtk/gtkdocklet.c:146
+#: ../gtk/gtkdocklet.c:149
 msgid "Right-click for more unread messages...\n"
 msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
 
-#: ../gtk/gtkdocklet.c:443
+#: ../gtk/gtkdocklet.c:456
 msgid "Change Status"
 msgstr "Ŝanĝu staton"
 
-#: ../gtk/gtkdocklet.c:446 ../gtk/gtkstatusbox.c:971
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
 #: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
 #: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2853
-#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+#: ../libgaim/protocols/novell/novell.c:2851
+#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
 msgid "Available"
 msgstr "Disponebla"
 
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:450 ../gtk/gtkprefs.c:1815 ../gtk/gtkstatusbox.c:972
+#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
 #: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:223
-#: ../libgaim/protocols/jabber/buddy.c:1371
-#: ../libgaim/protocols/novell/novell.c:2856
-#: ../libgaim/protocols/oscar/oscar.c:694
-#: ../libgaim/protocols/oscar/oscar.c:4408
-#: ../libgaim/protocols/oscar/oscar.c:5475
+#: ../libgaim/protocols/irc/msgs.c:226
+#: ../libgaim/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/novell/novell.c:2854
+#: ../libgaim/protocols/oscar/oscar.c:712
+#: ../libgaim/protocols/oscar/oscar.c:4498
+#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
 #: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3359
-#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+#: ../libgaim/protocols/yahoo/yahoo.c:3353
+#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
 msgid "Away"
 msgstr "Fora"
 
-#: ../gtk/gtkdocklet.c:454 ../gtk/gtkstatusbox.c:973
-#: ../libgaim/protocols/oscar/oscar.c:698
-#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
+#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
+#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
 msgid "Invisible"
 msgstr "Nevidebla"
 
-#: ../gtk/gtkdocklet.c:495
+#: ../gtk/gtkdocklet.c:508
 msgid "Show Buddy List"
 msgstr "Montru kunulliston"
 
-#: ../gtk/gtkdocklet.c:521
+#: ../gtk/gtkdocklet.c:534
 msgid "New Message..."
 msgstr "Nova mesaĝo..."
 
-#: ../gtk/gtkdocklet.c:536
+#: ../gtk/gtkdocklet.c:549
 msgid "Mute Sounds"
 msgstr "Malsonorigu"
 
-#: ../gtk/gtkdocklet.c:543
+#: ../gtk/gtkdocklet.c:556
 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
 #.
-#: ../gtk/gtkdocklet.c:554
+#: ../gtk/gtkdocklet.c:567
 msgid "Quit"
 msgstr "Finu"
 
@@ -2725,19 +2757,19 @@
 msgid "Not started"
 msgstr "Malkomencita"
 
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:1361
-#: ../libgaim/protocols/jabber/buddy.c:1378
-#: ../libgaim/protocols/novell/novell.c:2868
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:1397
+#: ../libgaim/protocols/jabber/buddy.c:1414
+#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
 msgid "Finished"
 msgstr "Finita"
 
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
 msgid "Canceled"
 msgstr "Rezignita"
 
@@ -2847,47 +2879,47 @@
 msgid "_Resume"
 msgstr "_Rekomenci"
 
-#: ../gtk/gtkft.c:1061
+#: ../gtk/gtkft.c:1058
 msgid "Failed"
 msgstr "Malsukcesita"
 
-#: ../gtk/gtkimhtml.c:814
+#: ../gtk/gtkimhtml.c:793
 msgid "Paste as Plain _Text"
 msgstr "Enmetu keil Plena _Teksto"
 
-#: ../gtk/gtkimhtml.c:831
+#: ../gtk/gtkimhtml.c:810
 msgid "_Reset formatting"
 msgstr "_Restarigu formatumon"
 
-#: ../gtk/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1295
 msgid "Hyperlink color"
 msgstr "Ligila koloro"
 
-#: ../gtk/gtkimhtml.c:1324
+#: ../gtk/gtkimhtml.c:1296
 msgid "Color to draw hyperlinks."
 msgstr "Koloro ligila."
 
-#: ../gtk/gtkimhtml.c:1327
+#: ../gtk/gtkimhtml.c:1299
 msgid "Hyperlink prelight color"
 msgstr ""
 
-#: ../gtk/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1300
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../gtk/gtkimhtml.c:1549
+#: ../gtk/gtkimhtml.c:1516
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiu Retadreson"
 
-#: ../gtk/gtkimhtml.c:1561
+#: ../gtk/gtkimhtml.c:1528
 msgid "_Open Link in Browser"
 msgstr "_Malfermu Ligilon en Retumilo"
 
-#: ../gtk/gtkimhtml.c:1571
+#: ../gtk/gtkimhtml.c:1538
 msgid "_Copy Link Location"
 msgstr "_Kopiu Ligilo-Lokon"
 
-#: ../gtk/gtkimhtml.c:3303
+#: ../gtk/gtkimhtml.c:3271
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -2897,7 +2929,7 @@
 "\n"
 "Apriorigas kiel PNG."
 
-#: ../gtk/gtkimhtml.c:3306
+#: ../gtk/gtkimhtml.c:3274
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -2907,7 +2939,7 @@
 "\n"
 "Apriorigas kiel PNG."
 
-#: ../gtk/gtkimhtml.c:3319
+#: ../gtk/gtkimhtml.c:3287
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -2918,7 +2950,7 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3322
+#: ../gtk/gtkimhtml.c:3290
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -2929,11 +2961,11 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3402 ../gtk/gtkimhtml.c:3414
+#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
-#: ../gtk/gtkimhtml.c:3442
+#: ../gtk/gtkimhtml.c:3410
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
@@ -2995,15 +3027,15 @@
 msgid "Smile!"
 msgstr "Ridetu!"
 
-#: ../gtk/gtkimhtmltoolbar.c:922
+#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
 msgid "Bold"
 msgstr "Grasa"
 
-#: ../gtk/gtkimhtmltoolbar.c:933
+#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
 msgid "Italic"
 msgstr "Kursiva"
 
-#: ../gtk/gtkimhtmltoolbar.c:944
+#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
 msgid "Underline"
 msgstr "Substrekita"
 
@@ -3043,21 +3075,21 @@
 msgid "Insert smiley"
 msgstr "Enmetu ridmienon"
 
-#: ../gtk/gtklog.c:219
+#: ../gtk/gtklog.c:234
 #, 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>"
 
-#: ../gtk/gtklog.c:224
+#: ../gtk/gtklog.c:237
 #, 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>"
 
-#: ../gtk/gtklog.c:273
+#: ../gtk/gtklog.c:284
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../gtk/gtklog.c:320
+#: ../gtk/gtklog.c:331
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -3065,35 +3097,40 @@
 "Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al "
 "sistem protokolo\" agordo estas ŝaltita."
 
-#: ../gtk/gtklog.c:324
+#: ../gtk/gtklog.c:335
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../gtk/gtklog.c:327
+#: ../gtk/gtklog.c:338
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
-#: ../gtk/gtklog.c:331
+#: ../gtk/gtklog.c:342
 msgid "No logs were found"
 msgstr "Neniu protokolo trovita"
 
-#: ../gtk/gtklog.c:410
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../gtk/gtklog.c:357
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../gtk/gtklog.c:425
 msgid "Total log size:"
 msgstr "Tuta protokolo grandeco:"
 
-#: ../gtk/gtklog.c:476
+#: ../gtk/gtklog.c:494
 #, c-format
 msgid "Conversations in %s"
 msgstr "Konversacioj en %s"
 
-#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
+#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversacioj kun %s"
 
-#: ../gtk/gtklog.c:560
+#: ../gtk/gtklog.c:578
 msgid "System Log"
 msgstr "Sistemo Protokolo"
 
@@ -3150,68 +3187,68 @@
 "%scontactinfo.php\n"
 msgstr ""
 
-#: ../gtk/gtknotify.c:348
+#: ../gtk/gtknotify.c:328
 msgid "Open All Messages"
 msgstr "Malfermu Ĉiujn Retmesaĝojn"
 
-#: ../gtk/gtknotify.c:432
+#: ../gtk/gtknotify.c:380
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
 
-#: ../gtk/gtknotify.c:498
+#: ../gtk/gtknotify.c:474
+msgid "Sender"
+msgstr "Sendanto"
+
+#: ../gtk/gtknotify.c:500
 #, 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."
 
-#: ../gtk/gtknotify.c:503
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5541
+#: ../gtk/gtknotify.c:511
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
 msgid "Search Results"
 msgstr "Serĉ-Rezultojn"
 
-#: ../gtk/gtknotify.c:890
+#: ../gtk/gtknotify.c:899
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La retumila komando \"%s\" estas malvalida."
 
-#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
-#: ../gtk/gtknotify.c:1045
+#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
+#: ../gtk/gtknotify.c:1054
 msgid "Unable to open URL"
 msgstr "Malfermeblas URL"
 
-#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Eraro lanĉante \"%s\": %s"
 
-#: ../gtk/gtknotify.c:1046
+#: ../gtk/gtknotify.c:1055
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
 
-#: ../gtk/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
 
-#: ../gtk/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Pluraj kromaĵoj estos elŝarĝitaj."
 
-#: ../gtk/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:285
 msgid "Unload Plugins"
 msgstr "Elŝarĝi Kormaĵojn"
 
-#: ../gtk/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:397
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -3222,7 +3259,7 @@
 "<span weight=\"bold\">Retsituo:</span>\t\t%s\n"
 "<span weight=\"bold\">Dosiernomo:</span>\t\t%s"
 
-#: ../gtk/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s\n"
@@ -3233,11 +3270,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
 "Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
 
-#: ../gtk/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:533
 msgid "Configure Pl_ugin"
 msgstr "Agrod_u Kromaĵon"
 
-#: ../gtk/gtkplugin.c:603
+#: ../gtk/gtkplugin.c:596
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Kromaĵo Detaloj</b>"
 
@@ -3245,185 +3282,185 @@
 msgid "Select a file"
 msgstr "Elektu dosieron"
 
-#: ../gtk/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "B.v. enigi kunulon atentigendan."
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:505
 msgid "New Buddy Pounce"
 msgstr "Nova Kunul Atentigo"
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:505
 msgid "Edit Buddy Pounce"
 msgstr "Redaktu Kunul Atentigo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:522
 msgid "Pounce on Whom"
 msgstr "Atentigi Kiun"
 
-#: ../gtk/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:549
 msgid "_Buddy name:"
 msgstr "K_unul nomo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:575
 msgid "Pounce When Buddy..."
 msgstr "Atentigu kiam Kunul..."
 
-#: ../gtk/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:583
 msgid "Si_gns on"
 msgstr "En_salutas"
 
-#: ../gtk/gtkpounce.c:579
-msgid "Signs o_ff"
-msgstr "A_udiaŭas"
-
-#: ../gtk/gtkpounce.c:581
-msgid "Goes a_way"
-msgstr "Foriĝ_as"
-
-#: ../gtk/gtkpounce.c:583
-msgid "Ret_urns from away"
-msgstr "Ek_malforiĝas"
-
 #: ../gtk/gtkpounce.c:585
-msgid "Becomes _idle"
-msgstr "Eksen_faras"
+msgid "Signs o_ff"
+msgstr "A_udiaŭas"
 
 #: ../gtk/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "Foriĝ_as"
+
+#: ../gtk/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "Ek_malforiĝas"
+
+#: ../gtk/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "Eksen_faras"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Is no longer i_dle"
 msgstr "Ekfa_ras"
 
-#: ../gtk/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:595
 msgid "Starts _typing"
 msgstr "Ta_jpas"
 
-#: ../gtk/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:597
 msgid "P_auses while typing"
 msgstr "P_aŭzas tajpante"
 
-#: ../gtk/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:599
 msgid "Stops t_yping"
 msgstr "Maltajpas"
 
-#: ../gtk/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:601
 msgid "Sends a _message"
 msgstr "Sendas mesagôn"
 
 #. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:636
 msgid "Action"
 msgstr "Ago"
 
-#: ../gtk/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:644
 msgid "Ope_n an IM window"
 msgstr "Malfermu TM-n fenestron"
 
-#: ../gtk/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:646
 msgid "_Pop up a notification"
 msgstr "Ŝ_prucigu avizon"
 
-#: ../gtk/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:648
 msgid "Send a _message"
 msgstr "Sendu mesaĝon"
 
-#: ../gtk/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:650
 msgid "E_xecute a command"
 msgstr "Lanĉu komandon"
 
-#: ../gtk/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:652
 msgid "P_lay a sound"
 msgstr "Ludu sonon"
 
-#: ../gtk/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:657
 msgid "Brows_e..."
 msgstr "Fol_iumi..."
 
-#: ../gtk/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:659
 msgid "Br_owse..."
 msgstr "Fol_iumi..."
 
-#: ../gtk/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:660
 msgid "Pre_view"
 msgstr "Antaŭvidu"
 
-#: ../gtk/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:784
 msgid "P_ounce only when my status is not available"
 msgstr "Atentigi nur kiam mia stato ne disponeblas"
 
-#: ../gtk/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:789
 msgid "_Recurring"
 msgstr "_Rikuranta"
 
-#: ../gtk/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr ""
 
-#: ../gtk/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1243
 msgid "Pounce Target"
 msgstr ""
 
-#: ../gtk/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1278
 msgid "Recurring"
 msgstr "Rikuranta"
 
-#: ../gtk/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Kunul Atentigoj"
 
-#: ../gtk/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ektajpis al vi (%s)"
 
-#: ../gtk/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s paŭzis tajpante al vi (%s)"
 
-#: ../gtk/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ensalutis (%s)"
 
-#: ../gtk/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s revenis el senfarado (%s)"
 
-#: ../gtk/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s revenis el forado (%s)"
 
-#: ../gtk/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ekmaltajpis vin (%s)"
 
-#: ../gtk/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s malsalutis (%s)"
 
-#: ../gtk/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s senfariĝis (%s)"
 
-#: ../gtk/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s foriĝis. (%s)"
 
-#: ../gtk/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s sendis mesaĝon al vi. (%s)"
 
-#: ../gtk/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -3443,12 +3480,6 @@
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:923
-#: ../libgaim/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "Priskibo"
-
 #: ../gtk/gtkprefs.c:816
 msgid "System Tray Icon"
 msgstr "Sistemlistela Piktogramo"
@@ -3457,14 +3488,15 @@
 msgid "_Show system tray icon:"
 msgstr "_Montru sistemlistelan piktogramon:"
 
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1640
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
 #: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
 #: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "Ĉiam"
 
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1805
-#: ../gtk/gtkprefs.c:1819 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
+#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../libgaim/plugins/autoreply.c:360
 msgid "Never"
 msgstr "Neniam"
 
@@ -3480,7 +3512,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
 
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1820
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
 msgid "When away"
 msgstr "Kiam fora"
 
@@ -3569,124 +3601,125 @@
 "Tiel aspektos vian elirantan mesaĝo tekston kiam vi uzas protokolojn kiuj "
 "subtenas formateblecon. :)"
 
-#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:779
-#: ../libgaim/protocols/oscar/oscar.c:3629
+#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
 msgid "IP Address"
 msgstr "IP adreso"
 
-#: ../gtk/gtkprefs.c:1012
+#: ../gtk/gtkprefs.c:1017
 msgid "ST_UN server:"
 msgstr "ST_UN servilo:"
 
-#: ../gtk/gtkprefs.c:1024
+#: ../gtk/gtkprefs.c:1029
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-#: ../gtk/gtkprefs.c:1028
+#: ../gtk/gtkprefs.c:1033
 msgid "_Autodetect IP address"
 msgstr "_Aŭtodetekti IP adreson"
 
-#: ../gtk/gtkprefs.c:1037
+#: ../gtk/gtkprefs.c:1042
 msgid "Public _IP:"
 msgstr "Publika _IP:"
 
-#: ../gtk/gtkprefs.c:1066
+#: ../gtk/gtkprefs.c:1071
 msgid "Ports"
 msgstr "Pordoj"
 
-#: ../gtk/gtkprefs.c:1069
+#: ../gtk/gtkprefs.c:1074
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Mane difinu intervalon de pordoj aŭskultendaj"
 
-#: ../gtk/gtkprefs.c:1072
+#: ../gtk/gtkprefs.c:1077
 msgid "_Start port:"
 msgstr "_Komenca pordo:"
 
-#: ../gtk/gtkprefs.c:1079
+#: ../gtk/gtkprefs.c:1084
 msgid "_End port:"
 msgstr "_Fina pordo:"
 
-#: ../gtk/gtkprefs.c:1087
+#: ../gtk/gtkprefs.c:1092
 msgid "Proxy Server"
 msgstr "Prokura Servilo"
 
-#: ../gtk/gtkprefs.c:1091
+#: ../gtk/gtkprefs.c:1096
 msgid "No proxy"
 msgstr "Sen prokurilo"
 
-#: ../gtk/gtkprefs.c:1147
+#: ../gtk/gtkprefs.c:1152
 msgid "_User:"
 msgstr "_Uzanto:"
 
-#: ../gtk/gtkprefs.c:1210
+#: ../gtk/gtkprefs.c:1216
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../gtk/gtkprefs.c:1211
+#: ../gtk/gtkprefs.c:1217
 msgid "Opera"
 msgstr "Opero"
 
-#: ../gtk/gtkprefs.c:1212
+#: ../gtk/gtkprefs.c:1218
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../gtk/gtkprefs.c:1213
+#: ../gtk/gtkprefs.c:1219
 msgid "Mozilla"
 msgstr "Mozilo"
 
-#: ../gtk/gtkprefs.c:1214
+#: ../gtk/gtkprefs.c:1220
 msgid "Konqueror"
 msgstr "Konkerilo"
 
-#: ../gtk/gtkprefs.c:1215
+#: ../gtk/gtkprefs.c:1221
 msgid "GNOME Default"
 msgstr "GNOME Aprioro"
 
-#: ../gtk/gtkprefs.c:1216
+#: ../gtk/gtkprefs.c:1222
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../gtk/gtkprefs.c:1217
+#: ../gtk/gtkprefs.c:1223
 msgid "Firefox"
 msgstr "Fajrovulpo"
 
-#: ../gtk/gtkprefs.c:1218
+#: ../gtk/gtkprefs.c:1224
 msgid "Firebird"
 msgstr "Fajrobirdo"
 
-#: ../gtk/gtkprefs.c:1219
+#: ../gtk/gtkprefs.c:1225
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../gtk/gtkprefs.c:1228
+#: ../gtk/gtkprefs.c:1234
 msgid "Manual"
 msgstr "Mane"
 
-#: ../gtk/gtkprefs.c:1281
+#: ../gtk/gtkprefs.c:1287
 msgid "Browser Selection"
 msgstr "Retumilo Elekto"
 
-#: ../gtk/gtkprefs.c:1285
+#: ../gtk/gtkprefs.c:1291
 msgid "_Browser:"
 msgstr "_Retumilo:"
 
-#: ../gtk/gtkprefs.c:1293
+#: ../gtk/gtkprefs.c:1299
 msgid "_Open link in:"
 msgstr "_Malfermu ligilon per:"
 
-#: ../gtk/gtkprefs.c:1295
+#: ../gtk/gtkprefs.c:1301
 msgid "Browser default"
 msgstr "Retumilo aprioro"
 
-#: ../gtk/gtkprefs.c:1296
+#: ../gtk/gtkprefs.c:1302
 msgid "Existing window"
 msgstr "Aktuala fenestro"
 
-#: ../gtk/gtkprefs.c:1298
+#: ../gtk/gtkprefs.c:1304
 msgid "New tab"
 msgstr "Nova langeto"
 
-#: ../gtk/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1318
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3695,79 +3728,79 @@
 "_Mane:\n"
 "(%s por URL)"
 
-#: ../gtk/gtkprefs.c:1352
+#: ../gtk/gtkprefs.c:1358
 msgid "Log _format:"
 msgstr "Protokolo _formato:"
 
-#: ../gtk/gtkprefs.c:1357
+#: ../gtk/gtkprefs.c:1363
 msgid "Log all _instant messages"
 msgstr "Protokolu ĉiujn _tujmesaĝojn"
 
-#: ../gtk/gtkprefs.c:1359
+#: ../gtk/gtkprefs.c:1365
 msgid "Log all c_hats"
 msgstr "Protokolu ĉiujn _babilojn"
 
-#: ../gtk/gtkprefs.c:1361
+#: ../gtk/gtkprefs.c:1367
 msgid "Log all _status changes to system log"
 msgstr "Protokolu ĉiujn _statoŝanĝojn al sistemprotokolo"
 
-#: ../gtk/gtkprefs.c:1507
+#: ../gtk/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Sono Elekto"
 
-#: ../gtk/gtkprefs.c:1515
+#: ../gtk/gtkprefs.c:1521
 msgid "Quietest"
 msgstr "Pli Malaŭta"
 
-#: ../gtk/gtkprefs.c:1517
-msgid "Quieter"
-msgstr "Pli Malaŭte"
-
-#: ../gtk/gtkprefs.c:1519
-msgid "Quiet"
-msgstr "Malaŭte"
-
-#: ../gtk/gtkprefs.c:1521 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normala"
-
 #: ../gtk/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "Pli Malaŭte"
+
+#: ../gtk/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "Malaŭte"
+
+#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "Normala"
+
+#: ../gtk/gtkprefs.c:1529
 msgid "Loud"
 msgstr "Laŭte"
 
-#: ../gtk/gtkprefs.c:1525
+#: ../gtk/gtkprefs.c:1531
 msgid "Louder"
 msgstr "Pli Laŭte"
 
-#: ../gtk/gtkprefs.c:1527
+#: ../gtk/gtkprefs.c:1533
 msgid "Loudest"
 msgstr "Pli Laŭta"
 
-#: ../gtk/gtkprefs.c:1590
+#: ../gtk/gtkprefs.c:1596
 msgid "Sound Method"
 msgstr "Sono Metodo"
 
-#: ../gtk/gtkprefs.c:1591
+#: ../gtk/gtkprefs.c:1597
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: ../gtk/gtkprefs.c:1593
+#: ../gtk/gtkprefs.c:1599
 msgid "Console beep"
 msgstr "Konzolo pepo"
 
-#: ../gtk/gtkprefs.c:1595
+#: ../gtk/gtkprefs.c:1601
 msgid "Automatic"
 msgstr "Aŭtomate"
 
-#: ../gtk/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1604
 msgid "Command"
 msgstr "Komando"
 
-#: ../gtk/gtkprefs.c:1599
+#: ../gtk/gtkprefs.c:1605
 msgid "No sounds"
 msgstr "Sen Sono"
 
-#: ../gtk/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1613
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3776,125 +3809,125 @@
 "Sono k_omando:\n"
 "(%s por dosiernomo)"
 
-#: ../gtk/gtkprefs.c:1633
+#: ../gtk/gtkprefs.c:1639
 msgid "Sound Options"
 msgstr "Son-opcioj"
 
-#: ../gtk/gtkprefs.c:1634
+#: ../gtk/gtkprefs.c:1640
 msgid "Sounds when conversation has _focus"
 msgstr "Sonu kiam konversacio _fokusas"
 
-#: ../gtk/gtkprefs.c:1636
+#: ../gtk/gtkprefs.c:1642
 msgid "Enable sounds:"
 msgstr "Ŝaltu Sonojn:"
 
-#: ../gtk/gtkprefs.c:1638
+#: ../gtk/gtkprefs.c:1644
 msgid "Only when available"
 msgstr "Nur kiam disponebla"
 
-#: ../gtk/gtkprefs.c:1639
+#: ../gtk/gtkprefs.c:1645
 msgid "Only when not available"
 msgstr "Nur kiam nedisponebla"
 
-#: ../gtk/gtkprefs.c:1647
+#: ../gtk/gtkprefs.c:1653
 msgid "Volume:"
 msgstr "Laŭteco:"
 
-#: ../gtk/gtkprefs.c:1675
+#: ../gtk/gtkprefs.c:1681
 msgid "Sound Events"
 msgstr "Soneventoj"
 
-#: ../gtk/gtkprefs.c:1726
+#: ../gtk/gtkprefs.c:1732
 msgid "Play"
 msgstr "Ludu"
 
-#: ../gtk/gtkprefs.c:1733
+#: ../gtk/gtkprefs.c:1739
 msgid "Event"
 msgstr "Evento"
 
-#: ../gtk/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1758
 msgid "Test"
 msgstr "Provo"
 
-#: ../gtk/gtkprefs.c:1756
+#: ../gtk/gtkprefs.c:1762
 msgid "Reset"
 msgstr "Restarigu"
 
-#: ../gtk/gtkprefs.c:1760
+#: ../gtk/gtkprefs.c:1766
 msgid "Choose..."
 msgstr "Elektu..."
 
-#: ../gtk/gtkprefs.c:1803
+#: ../gtk/gtkprefs.c:1809
 msgid "_Report idle time:"
 msgstr "_Raportu senfaran tempon:"
 
-#: ../gtk/gtkprefs.c:1806
+#: ../gtk/gtkprefs.c:1812
 msgid "From last sent message"
 msgstr "Ekde lasta sendita mesaĝo"
 
-#: ../gtk/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1814
 msgid "Based on keyboard or mouse use"
 msgstr "Laŭ klavaro aŭ muso uzo"
 
-#: ../gtk/gtkprefs.c:1817
+#: ../gtk/gtkprefs.c:1823
 msgid "_Auto-reply:"
 msgstr "_Aŭto-respondo:"
 
-#: ../gtk/gtkprefs.c:1821
+#: ../gtk/gtkprefs.c:1827
 msgid "When both away and idle"
 msgstr "Kiam ambaŭ fora kaj senfara"
 
 #. Auto-away stuff
-#: ../gtk/gtkprefs.c:1827
+#: ../gtk/gtkprefs.c:1833
 msgid "Auto-away"
 msgstr "Aŭto-fora"
 
-#: ../gtk/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1835
 msgid "Change status when _idle"
 msgstr "Ŝanĝu staton kiam _senfara"
 
-#: ../gtk/gtkprefs.c:1833
+#: ../gtk/gtkprefs.c:1839
 msgid "_Minutes before changing status:"
 msgstr "_Minutoj antaŭe ŝanĝenda staton:"
 
-#: ../gtk/gtkprefs.c:1841
+#: ../gtk/gtkprefs.c:1847
 msgid "Change _status to:"
 msgstr "Ŝangû _staton al:"
 
 #. Signon status stuff
-#: ../gtk/gtkprefs.c:1862
+#: ../gtk/gtkprefs.c:1868
 msgid "Status at Startup"
 msgstr "Stato je ensaluto"
 
-#: ../gtk/gtkprefs.c:1864
+#: ../gtk/gtkprefs.c:1870
 msgid "Use status from last _exit at startup"
 msgstr "Uzu stato de lasta malsaluto je sensaluto"
 
-#: ../gtk/gtkprefs.c:1870
+#: ../gtk/gtkprefs.c:1876
 msgid "Status to a_pply at startup:"
 msgstr "Stato aplikenda je ensaluto:"
 
-#: ../gtk/gtkprefs.c:1908
+#: ../gtk/gtkprefs.c:1914
 msgid "Interface"
 msgstr "Interfaco"
 
-#: ../gtk/gtkprefs.c:1910
+#: ../gtk/gtkprefs.c:1916
 msgid "Smiley Themes"
 msgstr "Ridmieno-temo"
 
-#: ../gtk/gtkprefs.c:1911
+#: ../gtk/gtkprefs.c:1917
 msgid "Sounds"
 msgstr "Sonoj"
 
-#: ../gtk/gtkprefs.c:1912 ../libgaim/protocols/silc/silc.c:1847
+#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Reto"
 
-#: ../gtk/gtkprefs.c:1917
+#: ../gtk/gtkprefs.c:1923
 msgid "Browser"
 msgstr "Retumilo"
 
-#: ../gtk/gtkprefs.c:1921
+#: ../gtk/gtkprefs.c:1927
 msgid "Status / Idle"
 msgstr "Stato / Senfara"
 
@@ -3969,10 +4002,6 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "B.v. enmetu la nomon de uzanto kiun vi deziras bloki."
 
-#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Bloku"
-
 #: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
@@ -3983,22 +4012,21 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Ĉu vi certas vi volas bloki %s?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1920
+#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
+#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1918
 #: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Jes"
 
-#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1921
+#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
+#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1919
 #: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Ne"
 
@@ -4006,84 +4034,88 @@
 msgid "Apply"
 msgstr "Apliku"
 
-#: ../gtk/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1469
 msgid "That file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../gtk/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
 msgstr "Ĉu vi deziras anstataŭigi ĝin?"
 
-#: ../gtk/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1471
 msgid "Overwrite"
 msgstr "Anstataŭigu"
 
-#: ../gtk/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1472
 msgid "Choose New Name"
 msgstr "Elektu Novan Nomon"
 
-#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Konservu Dosieron..."
 
-#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Malfermu Dosieron..."
 
-#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
 msgid "Select Folder..."
 msgstr "Elektu Dosierujon..."
 
-#: ../gtk/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
 msgid "_Add"
 msgstr "_Aldonu"
 
-#: ../gtk/gtkroomlist.c:355
+#: ../gtk/gtkroomlist.c:376
 msgid "Room List"
 msgstr "Babilejoj Listo"
 
 #. list button
-#: ../gtk/gtkroomlist.c:425
+#: ../gtk/gtkroomlist.c:446
 msgid "_Get List"
 msgstr "_Ricevu Liston"
 
 #. add button
-#: ../gtk/gtkroomlist.c:433
+#: ../gtk/gtkroomlist.c:454
 msgid "_Add Chat"
 msgstr "_Aldonu Babilejon"
 
+#: ../gtk/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
+
 #. Use button
-#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Uzu"
 
-#: ../gtk/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:725
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titolo jam uzata. Vi devas elekti unikan titolon."
 
-#: ../gtk/gtksavedstatuses.c:883
+#: ../gtk/gtksavedstatuses.c:913
 msgid "Different"
 msgstr "Malsama"
 
-#: ../gtk/gtksavedstatuses.c:1076
+#: ../gtk/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Stato:"
 
 #. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1127
+#: ../gtk/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Uzu _malsimilan staton por kelkaj kontoj"
 
 #. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1191
+#: ../gtk/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Konser_vu & Uzu"
 
-#: ../gtk/gtksavedstatuses.c:1397
+#: ../gtk/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "Stato por %s"
@@ -4137,19 +4169,19 @@
 msgstr "GStreamer malsukcesis ekon."
 
 #. connect to the server
-#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1021
 #: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2185
-#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
-#: ../libgaim/protocols/sametime/sametime.c:3731
+#: ../libgaim/protocols/novell/novell.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3742
 #: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2715
-#: ../libgaim/protocols/zephyr/zephyr.c:1617
+#: ../libgaim/protocols/yahoo/yahoo.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:1621
 msgid "Connecting"
 msgstr "Konektante"
 
-#: ../gtk/gtkstatusbox.c:545
+#: ../gtk/gtkstatusbox.c:571
 msgid "Waiting for network connection"
 msgstr "Atendante retkonekto"
 
@@ -4226,7 +4258,7 @@
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../gtk/gtkutils.c:2340
+#: ../gtk/gtkutils.c:2343
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4238,18 +4270,31 @@
 "<b>Bildo grandeco:</b> %dx%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:600
+#: ../libgaim/protocols/oscar/oscar.c:618
 msgid "Buddy Icon"
 msgstr "Kunul Piktogramo"
 
-#: ../gtk/gtkutils.c:2733
+#: ../gtk/gtkutils.c:2653
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../gtk/gtkutils.c:2655
+msgid "Icon Error"
+msgstr "Piktogramo Eraro"
+
+#: ../gtk/gtkutils.c:2656
+msgid "Could not set icon"
+msgstr "Ne eblis difini piktogramon"
+
+#: ../gtk/gtkutils.c:2757
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Malsukcesis malfermi dosieron '%s': %s"
 
-#: ../gtk/gtkutils.c:2782
+#: ../gtk/gtkutils.c:2806
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
@@ -4280,7 +4325,7 @@
 msgstr ""
 
 #: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827
+#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
 msgid "minutes"
 msgstr "minutoj"
 
@@ -4300,6 +4345,10 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: ../gtk/plugins/cap/cap.c:931
+msgid "Contact Availability Prediction"
+msgstr ""
+
 #. *< name
 #. *< version
 #: ../gtk/plugins/cap/cap.c:933
@@ -4375,8 +4424,58 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permesas ŝanĝi la poentojn de neaktiva/fora/senkonekta statoj de kunuloj "
-"por komputi kontaktan prioritaton."
+"Permesas ŝanĝi la poentojn de neaktiva/fora/senkonekta statoj de kunuloj por "
+"komputi kontaktan prioritaton."
+
+#: ../gtk/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Konversaciaj Koloroj"
+
+#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Agordu kolorojn en la konversacio-fenestro"
+
+#: ../gtk/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Eraraj Mesaĝoj"
+
+#: ../gtk/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Emfazitaj Mesaĝoj"
+
+#: ../gtk/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Sistemo Mesaĝoj"
+
+#: ../gtk/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Senditaj Mesaĝoj"
+
+#: ../gtk/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Ricevitaj Mesaĝoj"
+
+#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Elektu Koloron por %s"
+
+#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
+#: ../libgaim/protocols/msn/msn.c:1532
+msgid "General"
+msgstr "Ĝenerala"
+
+#: ../gtk/plugins/convcolors.c:301
+msgid "Ignore incoming format"
+msgstr ""
+
+#: ../gtk/plugins/convcolors.c:302
+msgid "Apply in Chats"
+msgstr "Apliku en Babilejoj"
+
+#: ../gtk/plugins/convcolors.c:303
+msgid "Apply in IMs"
+msgstr ""
 
 #: ../gtk/plugins/extplacement.c:80
 msgid "By conversation count"
@@ -4492,11 +4591,6 @@
 msgid "GtkTreeView Indent Expanders"
 msgstr ""
 
-#: ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Elektu Koloron por %s"
-
 #: ../gtk/plugins/gaimrc.c:322
 msgid "Select Color"
 msgstr "Elektu Koloron"
@@ -4510,10 +4604,6 @@
 msgid "Select Interface Font"
 msgstr "Elektu InterfacoTiparon"
 
-#: ../gtk/plugins/gaimrc.c:448
-msgid "General"
-msgstr "Ĝenerala"
-
 #: ../gtk/plugins/gaimrc.c:453
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Interfaco Tiparo"
@@ -4613,12 +4703,11 @@
 #. "Search"
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
 #: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1724
-#: ../libgaim/protocols/oscar/oscar.c:6087 ../libgaim/protocols/qq/group.c:121
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
-#: ../libgaim/protocols/qq/sys_msg.c:248
-#: ../libgaim/protocols/sametime/sametime.c:5614
+#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5621
 msgid "Search"
 msgstr "Serĉu"
 
@@ -4655,38 +4744,38 @@
 
 #: ../gtk/plugins/gevolution/eds-utils.c:73
 #: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1145
+#: ../libgaim/protocols/jabber/jabber.c:1162
 msgid "None"
 msgstr "Nenio"
 
-#: ../gtk/plugins/gevolution/gevolution.c:263
-#: ../gtk/plugins/gevolution/gevolution.c:269
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
 msgid "Unable to send e-mail"
 msgstr "Ne eblas sendi retmesaĝon"
 
-#: ../gtk/plugins/gevolution/gevolution.c:264
+#: ../gtk/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 
-#: ../gtk/plugins/gevolution/gevolution.c:270
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "La elektita kunul ne troveblas en la Evoluo-Kontaktoj."
-
-#: ../gtk/plugins/gevolution/gevolution.c:287
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr ""
+
+#: ../gtk/plugins/gevolution/gevolution.c:272
 msgid "Add to Address Book"
 msgstr "Aldonu al adresaro"
 
-#: ../gtk/plugins/gevolution/gevolution.c:291
+#: ../gtk/plugins/gevolution/gevolution.c:284
 msgid "Send E-Mail"
 msgstr "Sendu retmesaĝon"
 
 #. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:418
+#: ../gtk/plugins/gevolution/gevolution.c:411
 msgid "Evolution Integration Configuration"
 msgstr ""
 
 #. Label
-#: ../gtk/plugins/gevolution/gevolution.c:421
+#: ../gtk/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Elektu ĉiujn kontojn kiuj kunuloj endas aŭto-aldonita al."
 
@@ -4696,7 +4785,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:528
+#: ../gtk/plugins/gevolution/gevolution.c:521
 msgid "Evolution Integration"
 msgstr ""
 
@@ -4704,8 +4793,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:531
-#: ../gtk/plugins/gevolution/gevolution.c:533
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
 msgid "Provides integration with Evolution."
 msgstr ""
 
@@ -4790,6 +4879,26 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 
+#: ../gtk/plugins/markerline.c:23
+msgid "Markerline"
+msgstr ""
+
+#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Desegnu linion por indiki novan mesaĝon en konversacio."
+
+#: ../gtk/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
+msgid "_IM windows"
+msgstr "_TM fenestroj"
+
+#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
+msgid "C_hat windows"
+msgstr "B_abilfenestroj"
+
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -4851,82 +4960,74 @@
 "pecon redaktante komunan orkestrumon realtempe."
 
 #. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:687
+#: ../gtk/plugins/notify.c:670
 msgid "Notify For"
 msgstr "Avizu Por"
 
-#: ../gtk/plugins/notify.c:691
-msgid "_IM windows"
-msgstr "_TM fenestroj"
-
-#: ../gtk/plugins/notify.c:698
-msgid "C_hat windows"
-msgstr "B_abilfenestroj"
-
-#: ../gtk/plugins/notify.c:706
+#: ../gtk/plugins/notify.c:689
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Nur kiam iun diras vian ekran nomon"
 
-#: ../gtk/plugins/notify.c:716
+#: ../gtk/plugins/notify.c:699
 msgid "_Focused windows"
 msgstr "_Fokusitaj fenestoj"
 
 #. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:724
+#: ../gtk/plugins/notify.c:707
 msgid "Notification Methods"
 msgstr "Avizmetodoj"
 
-#: ../gtk/plugins/notify.c:731
+#: ../gtk/plugins/notify.c:714
 msgid "Prepend _string into window title:"
 msgstr "Prefik_su ĉenon en fenestrotitolo:"
 
 #. Count method button
-#: ../gtk/plugins/notify.c:750
+#: ../gtk/plugins/notify.c:733
 msgid "Insert c_ount of new messages into window title"
 msgstr "Enmetu n_ombron de novajn mesaĝoj en fenestrotitolo"
 
 #. Count xprop method button
-#: ../gtk/plugins/notify.c:759
+#: ../gtk/plugins/notify.c:742
 msgid "Insert count of new message into _X property"
 msgstr "Enmetu nombron de novaj mesaĝoj en _X eco"
 
 #. Urgent method button
-#: ../gtk/plugins/notify.c:767
+#: ../gtk/plugins/notify.c:750
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
 
 #. Raise window method button
-#: ../gtk/plugins/notify.c:776
+#: ../gtk/plugins/notify.c:759
 msgid "R_aise conversation window"
 msgstr "Startigu konversacio-fenestron"
 
 #. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:784
+#: ../gtk/plugins/notify.c:767
 msgid "Notification Removal"
 msgstr "Avizo Forigo"
 
 #. Remove on focus button
-#: ../gtk/plugins/notify.c:789
+#: ../gtk/plugins/notify.c:772
 msgid "Remove when conversation window _gains focus"
 msgstr "Forigu kiam konversacio fenestro ricevas _fokuson"
 
 #. Remove on click button
-#: ../gtk/plugins/notify.c:796
+#: ../gtk/plugins/notify.c:779
 msgid "Remove when conversation window _receives click"
 msgstr "Forigu kiam konversacio fenestro _ricevas alklakon"
 
 #. Remove on type button
-#: ../gtk/plugins/notify.c:804
+#: ../gtk/plugins/notify.c:787
 msgid "Remove when _typing in conversation window"
 msgstr "Forigu kiam _tajpante en konversacio fenestro"
 
 #. Remove on message send button
-#: ../gtk/plugins/notify.c:812
+#: ../gtk/plugins/notify.c:795
 msgid "Remove when a _message gets sent"
 msgstr "Forigu kiam _mesaĝo sendiĝas"
 
 #. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:821
+#: ../gtk/plugins/notify.c:804
 msgid "Remove on switch to conversation ta_b"
 msgstr "Forigu je ŝaĝo al konversacio l_angeto"
 
@@ -4936,7 +5037,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/notify.c:910
+#: ../gtk/plugins/notify.c:893
 msgid "Message Notification"
 msgstr "Mesaĝavizo"
 
@@ -4944,7 +5045,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provizas diversajn rimedojn por atentigi vin pro nelegitaj mesaĝoj."
 
@@ -5013,68 +5114,68 @@
 "ChangeLog."
 msgstr "Kontrolu ofte por noaj eldonoj kaj avizu la uzanton kun la ŝanĝprotokolo."
 
-#: ../gtk/plugins/spellchk.c:1963
+#: ../gtk/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
 msgstr "Duobligo Korekto"
 
-#: ../gtk/plugins/spellchk.c:1964
+#: ../gtk/plugins/spellchk.c:1966
 msgid "The specified word already exists in the correction list."
 msgstr "La elektita vorto jam ekzistas en la korektolisto."
 
-#: ../gtk/plugins/spellchk.c:2172
+#: ../gtk/plugins/spellchk.c:2180
 msgid "Text Replacements"
 msgstr "Teksto anstataŭigoj"
 
-#: ../gtk/plugins/spellchk.c:2195
+#: ../gtk/plugins/spellchk.c:2203
 msgid "You type"
 msgstr "Vi tajpas"
 
-#: ../gtk/plugins/spellchk.c:2209
+#: ../gtk/plugins/spellchk.c:2217
 msgid "You send"
 msgstr "Vi sendas"
 
-#: ../gtk/plugins/spellchk.c:2223
+#: ../gtk/plugins/spellchk.c:2231
 msgid "Whole words only"
 msgstr "Nur plenaj vortoj"
 
-#: ../gtk/plugins/spellchk.c:2235
+#: ../gtk/plugins/spellchk.c:2243
 msgid "Case sensitive"
 msgstr "Usklecodistinge"
 
-#: ../gtk/plugins/spellchk.c:2261
+#: ../gtk/plugins/spellchk.c:2269
 msgid "Add a new text replacement"
 msgstr "Aldonu novan teksto-anstataŭigon"
 
-#: ../gtk/plugins/spellchk.c:2277
+#: ../gtk/plugins/spellchk.c:2285
 msgid "You _type:"
 msgstr "Vi _tajpas:"
 
-#: ../gtk/plugins/spellchk.c:2294
+#: ../gtk/plugins/spellchk.c:2302
 msgid "You _send:"
 msgstr "Vi _sendas:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2306
+#: ../gtk/plugins/spellchk.c:2314
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Ekzakta uskleca kongruo (malŝaltita por aŭtomata usklecotrakto)"
 
-#: ../gtk/plugins/spellchk.c:2308
+#: ../gtk/plugins/spellchk.c:2316
 msgid "Only replace _whole words"
 msgstr "Nur anstataŭigu _planajn vortojn"
 
-#: ../gtk/plugins/spellchk.c:2333
+#: ../gtk/plugins/spellchk.c:2341
 msgid "General Text Replacement Options"
 msgstr "Ĝenerala Teksto Anstataŭigo Opcioj"
 
-#: ../gtk/plugins/spellchk.c:2334
+#: ../gtk/plugins/spellchk.c:2342
 msgid "Enable replacement of last word on send"
 msgstr "Ŝaltu anstataŭigon de lasta vorto je sendo"
 
-#: ../gtk/plugins/spellchk.c:2359
+#: ../gtk/plugins/spellchk.c:2367
 msgid "Text replacement"
 msgstr "Teksto anstataŭigo"
 
-#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
 
@@ -5096,17 +5197,9 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: ../gtk/plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat Tempomarko"
-
-#: ../gtk/plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Prokrasto"
-
-#: ../gtk/plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutoj."
+#: ../gtk/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "Montru Tempomarkojn Ĉiu"
 
 #. *< type
 #. *< ui_requirement
@@ -5114,17 +5207,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/timestamp.c:256
+#: ../gtk/plugins/timestamp.c:195
 msgid "Timestamp"
 msgstr "Tempomarko"
 
 #. *< name
 #. *< version
 #. *  summary
+#: ../gtk/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "Montru iChat-ajn Tempomarkojn"
+
 #. *  description
-#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Aldonas iChat-stilajn tempomarkojn al konversacioj je ĉiuj N minutoj."
+#: ../gtk/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Montru iChat-stilajn tempomarkojn ĉiuj N minutoj."
 
 #: ../gtk/plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -5176,8 +5273,9 @@
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn "
-"mesaĝajn tempmarkajn formatojn."
+msgstr ""
+"Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn mesaĝajn "
+"tempmarkajn formatojn."
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:183
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:569
@@ -5289,68 +5387,68 @@
 msgid "Provides options specific to Windows Gaim, such as buddy list docking."
 msgstr ""
 
-#: ../libgaim/account.c:774
+#: ../libgaim/account.c:769
 msgid "accounts"
 msgstr "kontoj"
 
-#: ../libgaim/account.c:918
+#: ../libgaim/account.c:915
 msgid "Password is required to sign on."
 msgstr "Pasvorto estas postulata por en saulti."
 
-#: ../libgaim/account.c:943
+#: ../libgaim/account.c:940
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enigu pasvorton por %s (%s)"
 
-#: ../libgaim/account.c:950
+#: ../libgaim/account.c:947
 msgid "Enter Password"
 msgstr "Enigu Pasvorton"
 
-#: ../libgaim/account.c:955
+#: ../libgaim/account.c:952
 msgid "Save password"
 msgstr "Konservu pasvorton"
 
-#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#: ../libgaim/account.c:986 ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mankanta protokolo-kromaĵo por %s"
 
-#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1317
 msgid "New passwords do not match."
 msgstr "Novaj pasvortoj malsamas."
 
-#: ../libgaim/account.c:1080
+#: ../libgaim/account.c:1094
 msgid "Fill out all fields completely."
 msgstr "Enigu ĉiujn kampojn komplete"
 
-#: ../libgaim/account.c:1103
+#: ../libgaim/account.c:1117
 msgid "Original password"
 msgstr "Originala pasvorto"
 
-#: ../libgaim/account.c:1110
+#: ../libgaim/account.c:1124
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: ../libgaim/account.c:1117
+#: ../libgaim/account.c:1131
 msgid "New password (again)"
 msgstr "Nova pasvorto (denove)"
 
-#: ../libgaim/account.c:1123
+#: ../libgaim/account.c:1137
 #, c-format
 msgid "Change password for %s"
 msgstr "Ŝanĝu pasvorton de %s"
 
-#: ../libgaim/account.c:1131
+#: ../libgaim/account.c:1145
 msgid "Please enter your current password and your new password."
 msgstr "B.v. enigi vian aktualan pasvorton kaj vian novan pasvorton."
 
-#: ../libgaim/account.c:1161
+#: ../libgaim/account.c:1175
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ŝanĝu uzanto-informon de %s"
 
-#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
 msgstr "Difini Uzanto Informon"
 
@@ -5383,7 +5481,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s ensalutis"
 
-#: ../libgaim/connection.c:325
+#: ../libgaim/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s malsalutis"
@@ -5462,101 +5560,101 @@
 msgid "Failed to get serv name: %s"
 msgstr "Malsukcesis ricevi servilnomon: %s"
 
-#: ../libgaim/dnsquery.c:490
+#: ../libgaim/dnsquery.c:491
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:495
+#: ../libgaim/dnsquery.c:496
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
-#: ../libgaim/dnsquery.c:798
+#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:553
+#: ../libgaim/dnsquery.c:554
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:557
+#: ../libgaim/dnsquery.c:558
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:734
-#, c-format
-msgid "Thread creation failure: %s"
-msgstr ""
-
 #: ../libgaim/dnsquery.c:735
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#: ../libgaim/dnsquery.c:736
 msgid "Unknown reason"
 msgstr "Nekonata kialo"
 
-#: ../libgaim/ft.c:191 ../libgaim/protocols/msn/msn.c:410
+#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:195
+#: ../libgaim/ft.c:199
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:199
+#: ../libgaim/ft.c:203
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:230
+#: ../libgaim/ft.c:239
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libgaim/ft.c:245
+#: ../libgaim/ft.c:254
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libgaim/ft.c:255
-msgid "Cannot send a directory."
-msgstr ""
-
 #: ../libgaim/ft.c:264
+msgid "Cannot send a directory."
+msgstr ""
+
+#: ../libgaim/ft.c:273
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:322
+#: ../libgaim/ft.c:331
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libgaim/ft.c:329
+#: ../libgaim/ft.c:338
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libgaim/ft.c:370
+#: ../libgaim/ft.c:379
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akcepti dosier-alŝuton demandon de %s?"
 
-#: ../libgaim/ft.c:374
+#: ../libgaim/ft.c:383
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5564,60 +5662,60 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/ft.c:407
+#: ../libgaim/ft.c:416
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libgaim/ft.c:459
+#: ../libgaim/ft.c:468
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:480
+#: ../libgaim/ft.c:489
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libgaim/ft.c:492
+#: ../libgaim/ft.c:501
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libgaim/ft.c:646
+#: ../libgaim/ft.c:655
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libgaim/ft.c:649
+#: ../libgaim/ft.c:658
 msgid "File transfer complete"
 msgstr "Dosiero alŝuto kompleta"
 
-#: ../libgaim/ft.c:1038
+#: ../libgaim/ft.c:1075
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vi rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1043
+#: ../libgaim/ft.c:1080
 msgid "File transfer cancelled"
 msgstr "Dosiero alŝuto rezignita"
 
-#: ../libgaim/ft.c:1101
+#: ../libgaim/ft.c:1138
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1106
+#: ../libgaim/ft.c:1143
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s rezignis la dosiero-alŝuton"
 
-#: ../libgaim/ft.c:1163
+#: ../libgaim/ft.c:1200
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dosiero alŝuto al %s malsukcesis."
 
-#: ../libgaim/ft.c:1165
+#: ../libgaim/ft.c:1202
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dosiero elŝuto de %s malsukcesis."
@@ -5695,32 +5793,32 @@
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"aim\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"aim\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"gg\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"gg\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"icq\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"icq\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"irc\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"irc\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:22
 msgid ""
@@ -5735,16 +5833,16 @@
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"sip\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"sip\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"xmpp\" "
-"URL-ojn."
+"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"xmpp\" URL-"
+"ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:25
 msgid ""
@@ -5850,10 +5948,10 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTO-RESPONDO>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2679
+#: ../libgaim/protocols/oscar/oscar.c:2719
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
@@ -5905,6 +6003,230 @@
 msgid "Gaim encountered errors unloading the plugin."
 msgstr ""
 
+#: ../libgaim/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Aŭtomate Akcepti"
+
+#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "Aŭtomate Akcepti dosier-alŝuton demandon de elektitaj uzantoj."
+
+#: ../libgaim/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Aŭtomate akceptita dosier-alŝuto \"%s\" de \"%s\" kompleta."
+
+#: ../libgaim/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "Kiam dosier-alŝuto demando alvenas de %s"
+
+#: ../libgaim/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+msgid "_Save"
+msgstr "_Konservu"
+
+#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
+#: ../libgaim/protocols/oscar/oscar.c:2234
+#: ../libgaim/protocols/oscar/oscar.c:2280
+#: ../libgaim/protocols/oscar/oscar.c:5838
+#: ../libgaim/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:6068
+#: ../libgaim/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
+#: ../libgaim/request.h:1360
+msgid "_Cancel"
+msgstr "_Rezignu"
+
+#: ../libgaim/plugins/autoaccept.c:166
+msgid "Ask"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:167
+msgid "Auto Accept"
+msgstr "Aŭtomate Akcepti"
+
+#: ../libgaim/plugins/autoaccept.c:168
+msgid "Auto Reject"
+msgstr "Aŭtomate Malakcepti"
+
+#: ../libgaim/plugins/autoaccept.c:181
+msgid "Autoaccept File Transfers..."
+msgstr "Aŭtomate Akcepti Dosiero-Alŝutojn..."
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libgaim/plugins/autoaccept.c:211
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:216
+msgid "Automatically reject from users not in buddy list"
+msgstr "Aŭtomate malakcepti uzantojn ekster la kunullisto"
+
+#: ../libgaim/plugins/autoaccept.c:220
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:23
+msgid "Autoreply"
+msgstr "Aŭtomate-respondo"
+
+#: ../libgaim/plugins/autoreply.c:25
+msgid "Autoreply for all the protocols"
+msgstr ""
+
+#: ../libgaim/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
+#: ../libgaim/plugins/autoreply.c:218
+#, c-format
+msgid "Set autoreply message for %s"
+msgstr "Difini aŭtomatan mesaĝon por %s"
+
+#: ../libgaim/plugins/autoreply.c:220
+msgid "Set Autoreply Message"
+msgstr "Difini Aŭtomatan Mesaĝon"
+
+#: ../libgaim/plugins/autoreply.c:221
+msgid ""
+"The following message will be sent to the buddy when the buddy sends you a "
+"message and autoreply is enabled."
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:238
+msgid "Set _Autoreply Message"
+msgstr "Difinu _Aŭtomatan Mesaĝon"
+
+#: ../libgaim/plugins/autoreply.c:249
+msgid "Autoreply message"
+msgstr "Aŭtomata respondo mesaĝo"
+
+#: ../libgaim/plugins/autoreply.c:336
+msgid "Send autoreply messages when"
+msgstr "Sendu aŭtomatorespondajn mesaĝojn kiam"
+
+#: ../libgaim/plugins/autoreply.c:340
+msgid "When my account is _away"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:344
+msgid "When my account is _idle"
+msgstr "Kiam mia konto _senfaras"
+
+#: ../libgaim/plugins/autoreply.c:348
+msgid "_Default reply"
+msgstr "Apriora respon_do"
+
+#: ../libgaim/plugins/autoreply.c:354
+msgid "Status message"
+msgstr "Stato mesaĝo"
+
+#: ../libgaim/plugins/autoreply.c:358
+msgid "Autoreply with status message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:362
+msgid "Always when there is a status message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:364
+msgid "Only when there's no autoreply message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:369
+msgid "Delay between autoreplies"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:373
+msgid "_Minimum delay (mins)"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:377
+msgid "Times to send autoreplies"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:381
+msgid "Ma_ximum count"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:428
+msgid ""
+"I am currently not available. Please leave your message, and I will get back "
+"to you as soon as possible."
+msgstr ""
+
+#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1641
+msgid "Notes"
+msgstr "Notoj"
+
+#: ../libgaim/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr ""
+
+#: ../libgaim/plugins/buddynote.c:61
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/buddynote.c:87
+msgid "Buddy Notes"
+msgstr "Kunul Notoj"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/buddynote.c:89
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *  summary
+#: ../libgaim/plugins/buddynote.c:90
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5960,11 +6282,6 @@
 msgid "_Set"
 msgstr "_Difinu"
 
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228
-msgid "_Cancel"
-msgstr "_Rezignu"
-
 #: ../libgaim/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Neniu el viaj kontoj senfaras."
@@ -6035,92 +6352,100 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1416
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libgaim/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Uzanto senkonektas."
 
-#: ../libgaim/plugins/log_reader.c:1422
+#: ../libgaim/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Aŭto-respondo sendita:"
 
-#: ../libgaim/plugins/log_reader.c:1432 ../libgaim/plugins/log_reader.c:1435
+#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s malsalutis."
 
-#: ../libgaim/plugins/log_reader.c:1449
+#: ../libgaim/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1459
+#: ../libgaim/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Vi estis diskonektita de la servilo."
 
-#: ../libgaim/plugins/log_reader.c:1467
+#: ../libgaim/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1482
+#: ../libgaim/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1487
+#: ../libgaim/plugins/log_reader.c:1623
 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.
-#: ../libgaim/plugins/log_reader.c:1840 ../libgaim/plugins/log_reader.c:1949
+#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1853 ../libgaim/plugins/log_reader.c:1954
+#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
 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.
-#: ../libgaim/plugins/log_reader.c:1865 ../libgaim/plugins/log_reader.c:1958
+#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1878 ../libgaim/plugins/log_reader.c:1963
+#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1890 ../libgaim/plugins/log_reader.c:1967
+#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:1931
+#: ../libgaim/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Ĝenerala Protokolo Legado Agordo"
 
-#: ../libgaim/plugins/log_reader.c:1935
+#: ../libgaim/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Rapidaj grandeco kalkuloj"
 
-#: ../libgaim/plugins/log_reader.c:1939
+#: ../libgaim/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:1945
+#: ../libgaim/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Protokolo Dosierujo"
 
@@ -6130,19 +6455,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:1990
+#: ../libgaim/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Protokolo Legilo"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:1994
+#: ../libgaim/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:1998
+#: ../libgaim/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6160,6 +6485,69 @@
 msgid "Loads .NET plugins with Mono."
 msgstr "Ŝarĝas .NET-ajn kromaĵojn pere de Mono."
 
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/newline.c:68
+msgid "New Line"
+msgstr "Nova Linio"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *  summary
+#: ../libgaim/plugins/newline.c:71
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:95
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:152
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:156
+msgid "Offline Message"
+msgstr "Senkonekta Mesaĝo"
+
+#: ../libgaim/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:187
+msgid "Save offline messages in pounce"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:191
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6189,7 +6577,9 @@
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, 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!"
+msgstr ""
+"Igas aperon de konversacia fenestro kiam alia uzanto komencas mesaĝi vin.  "
+"Tio funkcias por AIM, ICQ, Jabber, Sametime, kaj Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6388,25 +6778,6 @@
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/sametime/sametime.c:3274
-#, c-format
-msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>Stato:</b> %s"
-
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>Mesaĝo:</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6417,46 +6788,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:435
-#: ../libgaim/protocols/bonjour/bonjour.c:437
+#: ../libgaim/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:438
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:473
-#: ../libgaim/protocols/bonjour/bonjour.c:481
-#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/bonjour/bonjour.c:474
+#: ../libgaim/protocols/bonjour/bonjour.c:482
+#: ../libgaim/protocols/bonjour/bonjour.c:540
 #: ../libgaim/protocols/silc/silc.c:300
 msgid "Gaim User"
 msgstr "Gaim Uzanto"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/bonjour/bonjour.c:578
 #: ../libgaim/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Komputilnomo"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:796
+#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:807
 msgid "First name"
 msgstr "Antaŭ nomo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:801
+#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:812
 msgid "Last name"
 msgstr "Familia nomo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:797
 #: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:590
+#: ../libgaim/protocols/bonjour/bonjour.c:591
 msgid "AIM Account"
 msgstr "AIM Konto"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:593
+#: ../libgaim/protocols/bonjour/bonjour.c:594
 msgid "Jabber Account"
 msgstr "Jabber Konto"
 
@@ -6489,11 +6860,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1777
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1777
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -6562,8 +6933,8 @@
 msgstr "Registro pleniĝis sukcese!"
 
 #: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:775
-#: ../libgaim/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/jabber/jabber.c:1352
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -6587,27 +6958,11 @@
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#. General
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2188
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:800
-#: ../libgaim/protocols/jabber/buddy.c:1526
-#: ../libgaim/protocols/jabber/buddy.c:1708
-#: ../libgaim/protocols/jabber/jabber.c:791
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
-#: ../libgaim/protocols/qq/buddy_info.c:41
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
-msgid "Nickname"
-msgstr "Karesnomo"
-
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
-#: ../libgaim/protocols/oscar/oscar.c:3685
-#: ../libgaim/protocols/oscar/oscar.c:3693
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
+#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3777
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Urbo"
 
@@ -6615,10 +6970,12 @@
 msgid "Year of birth"
 msgstr "Naskiĝjaro"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/oscar/oscar.c:3649
-#: ../libgaim/protocols/qq/buddy_info.c:44
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
+#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
+#: ../libgaim/protocols/qq/qq.c:234
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Sekso"
 
@@ -6626,13 +6983,13 @@
 msgid "Male or female"
 msgstr "Malina aŭ ina"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3649
-#: ../libgaim/protocols/qq/buddy_info.c:81
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Malina"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3649
-#: ../libgaim/protocols/qq/buddy_info.c:82
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Ina"
 
@@ -6689,125 +7046,126 @@
 msgid "Add to chat..."
 msgstr "Aldonu al babilejo..."
 
-#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/oscar/oscar.c:3621
+#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/oscar/oscar.c:2654
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
-#: ../libgaim/protocols/jabber/buddy.c:1522
-#: ../libgaim/protocols/jabber/buddy.c:1698
-#: ../libgaim/protocols/oscar/oscar.c:3632
+#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/buddy.c:1558
+#: ../libgaim/protocols/jabber/buddy.c:1734
+#: ../libgaim/protocols/oscar/oscar.c:3704
 #: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Persona Nomo"
 
-#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Naskiĝjaro"
 
-#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Unable to display the search results."
 msgstr "Ne eblas vidigi la serĉo-rezultojn."
 
-#: ../libgaim/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Publika Katalogo"
 
-#: ../libgaim/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Serĉo rezultoj"
 
-#: ../libgaim/protocols/gg/gg.c:1196
+#: ../libgaim/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
+#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1377
+#: ../libgaim/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1385
+#: ../libgaim/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1716
+#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
 msgid "Connection failed."
 msgstr "Konekto malsukcesis."
 
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
 msgid "Blocked"
 msgstr "Blokita"
 
-#: ../libgaim/protocols/gg/gg.c:1645
+#: ../libgaim/protocols/gg/gg.c:1656
 msgid "Add to chat"
 msgstr "Aldonu al babilejo"
 
-#: ../libgaim/protocols/gg/gg.c:1654
+#: ../libgaim/protocols/gg/gg.c:1665
 msgid "Unblock"
 msgstr "Malbloku"
 
-#: ../libgaim/protocols/gg/gg.c:1658
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Block"
 msgstr "Bloku"
 
-#: ../libgaim/protocols/gg/gg.c:1675
+#: ../libgaim/protocols/gg/gg.c:1686
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#: ../libgaim/protocols/gg/gg.c:1908
+#: ../libgaim/protocols/gg/gg.c:1926
 msgid "Chat error"
 msgstr "Babileraro"
 
-#: ../libgaim/protocols/gg/gg.c:1909
+#: ../libgaim/protocols/gg/gg.c:1927
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-#: ../libgaim/protocols/gg/gg.c:1992
+#: ../libgaim/protocols/gg/gg.c:2010
 msgid "Not connected to the server."
 msgstr "Ne konektita al servilo."
 
-#: ../libgaim/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Find buddies..."
 msgstr "Trovu kunulojn..."
 
-#: ../libgaim/protocols/gg/gg.c:2021
+#: ../libgaim/protocols/gg/gg.c:2039
 msgid "Change password..."
 msgstr "Ŝanĝu pasvorton..."
 
-#: ../libgaim/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2045
 msgid "Upload buddylist to Server"
 msgstr "Alŝutu kunulliston al Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2049
 msgid "Download buddylist from Server"
 msgstr "Elŝutu kunulliston el Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2035
+#: ../libgaim/protocols/gg/gg.c:2053
 msgid "Delete buddylist from Server"
 msgstr "Forigu kunulliston de Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libgaim/protocols/gg/gg.c:2057
 msgid "Save buddylist to file..."
 msgstr "Konservu kunulliston en dosiero..."
 
-#: ../libgaim/protocols/gg/gg.c:2043
+#: ../libgaim/protocols/gg/gg.c:2061
 msgid "Load buddylist from file..."
 msgstr "Ŝarĝu kunulliston el dosiero..."
 
@@ -6822,16 +7180,16 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2140
+#: ../libgaim/protocols/gg/gg.c:2159
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protokol-Kromaĵo"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2141
+#: ../libgaim/protocols/gg/gg.c:2160
 msgid "Polish popular IM"
 msgstr "Pola fama TM"
 
-#: ../libgaim/protocols/gg/gg.c:2189
+#: ../libgaim/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
@@ -6840,27 +7198,27 @@
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
 #: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuala temo estas: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
 #: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "Neniu temo estas"
 
-#: ../libgaim/protocols/irc/dcc_send.c:293
-#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/irc/dcc_send.c:296
+#: ../libgaim/protocols/irc/dcc_send.c:337
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
-#: ../libgaim/protocols/irc/dcc_send.c:294
-#: ../libgaim/protocols/irc/dcc_send.c:335
+#: ../libgaim/protocols/irc/dcc_send.c:297
+#: ../libgaim/protocols/irc/dcc_send.c:338
 msgid "Gaim could not open a listening port."
 msgstr ""
 
@@ -6902,8 +7260,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
-#: ../libgaim/protocols/jabber/jabber.c:916
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
+#: ../libgaim/protocols/jabber/jabber.c:927
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
@@ -6912,16 +7270,16 @@
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
-#: ../libgaim/protocols/oscar/oscar.c:1220
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
+#: ../libgaim/protocols/oscar/oscar.c:1263
 msgid "Couldn't connect to host"
 msgstr "Ne povis konekti al servilo"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
 msgid "Connection Failed"
 msgstr "Konekto Malsukcesis"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
 msgid "SSL Handshake Failed"
 msgstr "SSL kvitanca reĝimo malsukcesis"
 
@@ -6935,8 +7293,8 @@
 msgstr "Uzantoj"
 
 #: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3385
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Temo"
@@ -6949,48 +7307,49 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:902
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:904
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "La IRC Protokolo Kromaĵo kiu Malpli Fekas"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/jabber/jabber.c:1961
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6533
-#: ../libgaim/protocols/qq/qq.c:1031
-#: ../libgaim/protocols/sametime/sametime.c:5720
-#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
-#: ../libgaim/protocols/simple/simple.c:1835
+#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
+#: ../libgaim/protocols/jabber/jabber.c:1984
+#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
+#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
+#: ../libgaim/protocols/sametime/sametime.c:5727
+#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
+#: ../libgaim/protocols/simple/simple.c:1836
 #: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Servilo"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/oscar/oscar.c:6536 ../libgaim/protocols/qq/qq.c:1034
-#: ../libgaim/protocols/sametime/sametime.c:5725
-#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
+#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
+#: ../libgaim/protocols/oscar/libaim.c:136
+#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
+#: ../libgaim/protocols/sametime/sametime.c:5732
+#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libgaim/protocols/irc/irc.c:928
+#: ../libgaim/protocols/irc/irc.c:929
 msgid "Encodings"
 msgstr "Kodoprezentoj"
 
-#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/jabber/jabber.c:771
-#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
-#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
-#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
+#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
+#: ../libgaim/protocols/jabber/jabber.c:782
+#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
 #: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Vera nomo"
@@ -6999,7 +7358,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:942
+#: ../libgaim/protocols/irc/irc.c:943
 msgid "Use SSL"
 msgstr "Uzu SSL-n"
 
@@ -7021,141 +7380,131 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ne povas malpermesi %s: malpermesolisto estas plena"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/irc/msgs.c:248
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr "<b>%s:</b> %s"
-
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3622
-#: ../libgaim/protocols/silc/ops.c:1412
-msgid "Nick"
-msgstr "Karesnomo"
+#: ../libgaim/protocols/irc/msgs.c:217
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
 
 #: ../libgaim/protocols/irc/msgs.c:218
-msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
-
-#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identiĝita)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/silc/ops.c:1414
+msgid "Nick"
+msgstr "Karesnomo"
+
+#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Aktuale ĉe"
 
-#: ../libgaim/protocols/irc/msgs.c:246
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Senfara dum:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:250
+msgid "Idle for"
+msgstr "Senfara dum"
+
+#: ../libgaim/protocols/irc/msgs.c:253
 msgid "Online since"
 msgstr "Enrete ek de"
 
-#: ../libgaim/protocols/irc/msgs.c:252
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr "<br><b>Definante adjektivon :</b> Glora<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>Difinante adjektivon:</b>"
+
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "Glorious"
+msgstr "Glora"
+
+#: ../libgaim/protocols/irc/msgs.c:333
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ŝanĝis la temon al: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:335
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s forviŝis la temon."
 
-#: ../libgaim/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:343
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "La temo por %s estas: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:361
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nekonata mesaĝo '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Unknown message"
 msgstr "Nekonata mesaĝo"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim sendis mesaĝon la IRC servilo ne komprenis."
 
-#: ../libgaim/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:385
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uzantoj ĉe %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:515
 msgid "Time Response"
 msgstr "Tempo Respondo"
 
-#: ../libgaim/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:516
 msgid "The IRC server's local time is:"
 msgstr "La IRC servilo loka tempo estas:"
 
-#: ../libgaim/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:527
 msgid "No such channel"
 msgstr "Neniu tia kanalo"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:538
 msgid "no such channel"
 msgstr "neniu tia kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:541
 msgid "User is not logged in"
 msgstr "Uzanto ne estas ensalutita"
 
-#: ../libgaim/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:546
 msgid "No such nick or channel"
 msgstr "Neniu tia karesnomo aŭ kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:566
 msgid "Could not send"
 msgstr "Ne sendeblis"
 
-#: ../libgaim/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:622
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Aliĝi %s postulas inviton."
 
-#: ../libgaim/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:623
 msgid "Invitation only"
 msgstr "Nur per invito"
 
-#: ../libgaim/protocols/irc/msgs.c:726
+#: ../libgaim/protocols/irc/msgs.c:732
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vi estas forigita de %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
+#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Forigita de %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:760
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moduso (%s %s) de %s"
 
-#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
 msgid "Invalid nickname"
 msgstr "Malvalida karesnomo"
 
-#: ../libgaim/protocols/irc/msgs.c:841
+#: ../libgaim/protocols/irc/msgs.c:847
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7163,7 +7512,7 @@
 "Via elektita karesnomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libgaim/protocols/irc/msgs.c:846
+#: ../libgaim/protocols/irc/msgs.c:852
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7171,42 +7520,42 @@
 "Via elektita kontonomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libgaim/protocols/irc/msgs.c:885
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Cannot change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libgaim/protocols/irc/msgs.c:885
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Could not change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libgaim/protocols/irc/msgs.c:906
+#: ../libgaim/protocols/irc/msgs.c:912
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:948
+#: ../libgaim/protocols/irc/msgs.c:954
 msgid "Error: invalid PONG from server"
 msgstr "Eraro: malvalida PONG el servilo"
 
-#: ../libgaim/protocols/irc/msgs.c:950
+#: ../libgaim/protocols/irc/msgs.c:956
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING respondo -- [Lag]: %lu sekundoj"
 
-#: ../libgaim/protocols/irc/msgs.c:1031
+#: ../libgaim/protocols/irc/msgs.c:1037
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne povas aliĝi %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne povas aliĝi kanalon"
 
-#: ../libgaim/protocols/irc/msgs.c:1066
+#: ../libgaim/protocols/irc/msgs.c:1072
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Karesnomo aŭ kanalo estas provizore ne disponebla."
 
-#: ../libgaim/protocols/irc/msgs.c:1078
+#: ../libgaim/protocols/irc/msgs.c:1084
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops el %s"
@@ -7295,7 +7644,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1766
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -7406,142 +7755,143 @@
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:109
+#: ../libgaim/protocols/jabber/auth.c:112
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
 #: ../libgaim/protocols/jabber/auth.c:232
-#: ../libgaim/protocols/jabber/auth.c:233
-#: ../libgaim/protocols/jabber/auth.c:401
-#: ../libgaim/protocols/jabber/auth.c:402
-#: ../libgaim/protocols/jabber/auth.c:483
-#: ../libgaim/protocols/jabber/auth.c:484
+msgid "Server couldn't authenticate you without a password"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/auth.c:235
+#: ../libgaim/protocols/jabber/auth.c:236
+#: ../libgaim/protocols/jabber/auth.c:404
+#: ../libgaim/protocols/jabber/auth.c:405
+#: ../libgaim/protocols/jabber/auth.c:486
+#: ../libgaim/protocols/jabber/auth.c:487
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-#: ../libgaim/protocols/jabber/auth.c:234
-#: ../libgaim/protocols/jabber/auth.c:403
-#: ../libgaim/protocols/jabber/auth.c:485
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:488
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:240
-#: ../libgaim/protocols/jabber/auth.c:411
-#: ../libgaim/protocols/jabber/auth.c:493
+#: ../libgaim/protocols/jabber/auth.c:243
+#: ../libgaim/protocols/jabber/auth.c:414
+#: ../libgaim/protocols/jabber/auth.c:496
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:324
-#: ../libgaim/protocols/jabber/auth.c:446
-#: ../libgaim/protocols/jabber/auth.c:614
-#: ../libgaim/protocols/jabber/auth.c:747
-#: ../libgaim/protocols/jabber/auth.c:759
-#: ../libgaim/protocols/jabber/auth.c:778
-#: ../libgaim/protocols/jabber/jabber.c:112
+#: ../libgaim/protocols/jabber/auth.c:327
+#: ../libgaim/protocols/jabber/auth.c:449
+#: ../libgaim/protocols/jabber/auth.c:617
+#: ../libgaim/protocols/jabber/auth.c:751
+#: ../libgaim/protocols/jabber/auth.c:776
+#: ../libgaim/protocols/jabber/auth.c:795
+#: ../libgaim/protocols/jabber/jabber.c:113
 msgid "Invalid response from server."
 msgstr "Malvalida respondo el servilo."
 
-#: ../libgaim/protocols/jabber/auth.c:635
+#: ../libgaim/protocols/jabber/auth.c:638
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:722
+#: ../libgaim/protocols/jabber/auth.c:726
 msgid "SASL error"
 msgstr "SASL eraro"
 
-#: ../libgaim/protocols/jabber/buddy.c:268
-#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:783
+#: ../libgaim/protocols/sametime/sametime.c:4148
 #: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Plena Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:269
-#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/buddy.c:796
 #: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Familia Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:270
-#: ../libgaim/protocols/jabber/buddy.c:786
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:800
 msgid "Given Name"
 msgstr "Donita Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/jabber.c:831
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/jabber.c:842
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:838
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:852
 msgid "Street Address"
 msgstr "Strato Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:834
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:848
 msgid "Extended Address"
 msgstr "Plia Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/buddy.c:842
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:856
 msgid "Locality"
 msgstr "Loko"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:846
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:860
 msgid "Region"
 msgstr "Regiono"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:850
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:864
 msgid "Postal Code"
 msgstr "Poŝto Kodo"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:869
 #: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "Lando"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
-#: ../libgaim/protocols/jabber/buddy.c:873
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:880
+#: ../libgaim/protocols/jabber/buddy.c:887
 msgid "Telephone"
 msgstr "Telfono"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:884
-#: ../libgaim/protocols/jabber/buddy.c:892
-#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:898
+#: ../libgaim/protocols/jabber/buddy.c:906
+#: ../libgaim/protocols/jabber/buddy.c:1564
 #: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:907
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
 msgstr "Organizacio nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:911
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:925
 msgid "Organization Unit"
 msgstr "Organizacio Unito"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:920
+#: ../libgaim/protocols/jabber/buddy.c:287
+#: ../libgaim/protocols/jabber/buddy.c:934
 msgid "Role"
 msgstr "Rolo"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
-#: ../libgaim/protocols/oscar/oscar.c:3665
+#: ../libgaim/protocols/jabber/buddy.c:288
+#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/oscar/oscar.c:3743
 msgid "Birthday"
 msgstr "Naskiĝdato"
 
@@ -7556,170 +7906,167 @@
 "comfortable."
 msgstr "Ĉiuj eroj sube opcias. Enskribi nur informon kiu konfortigas vin."
 
-#: ../libgaim/protocols/jabber/buddy.c:640
-msgid "Client:"
-msgstr "Kiento:"
-
-#: ../libgaim/protocols/jabber/buddy.c:644
-#: ../libgaim/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:652
+#: ../libgaim/protocols/jabber/buddy.c:691
+msgid "Client"
+msgstr "Kliento"
+
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/buddy.c:695
 msgid "Operating System"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libgaim/protocols/jabber/buddy.c:666
+#: ../libgaim/protocols/jabber/jabber.c:1987
 msgid "Resource"
 msgstr "Rimedo"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/jabber.c:1204
-#: ../libgaim/protocols/jabber/jabber.c:1214
-#: ../libgaim/protocols/jabber/jabber.c:1224
-#: ../libgaim/protocols/jabber/jabber.c:1234
-#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/buddy.c:668
+#: ../libgaim/protocols/jabber/jabber.c:1226
+#: ../libgaim/protocols/jabber/jabber.c:1236
+#: ../libgaim/protocols/jabber/jabber.c:1246
+#: ../libgaim/protocols/jabber/jabber.c:1256
+#: ../libgaim/protocols/jabber/jabber.c:1266
 msgid "Priority"
 msgstr "Prioriteco"
 
-#: ../libgaim/protocols/jabber/buddy.c:673
-msgid "Client"
-msgstr "Kliento"
-
-#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/jabber/buddy.c:804
 #: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:823
-#: ../libgaim/protocols/jabber/jabber.c:806
-#: ../libgaim/protocols/oscar/oscar.c:3684
-#: ../libgaim/protocols/oscar/oscar.c:3692
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3763
+#: ../libgaim/protocols/oscar/oscar.c:3776
+#: ../libgaim/protocols/qq/buddy_info.c:56
 #: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:830
+#: ../libgaim/protocols/jabber/buddy.c:844
 msgid "P.O. Box"
 msgstr "P.O. Kesto"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1344
 msgid "Un-hide From"
 msgstr "Malkaŝu De"
 
-#: ../libgaim/protocols/jabber/buddy.c:1312
+#: ../libgaim/protocols/jabber/buddy.c:1348
 msgid "Temporarily Hide From"
 msgstr "Provizore Kaŝu De"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1320
+#: ../libgaim/protocols/jabber/buddy.c:1356
 msgid "Cancel Presence Notification"
 msgstr "Ĉesigu Prezentavizon"
 
-#: ../libgaim/protocols/jabber/buddy.c:1327
+#: ../libgaim/protocols/jabber/buddy.c:1363
 msgid "(Re-)Request authorization"
 msgstr "(Re-)demandu permeson"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1336
+#: ../libgaim/protocols/jabber/buddy.c:1372
 msgid "Unsubscribe"
 msgstr "Eliĝu"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/buddy.c:1405
+#: ../libgaim/protocols/jabber/jabber.c:1235
 msgid "Chatty"
 msgstr "Babilema"
 
-#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Longfora"
 
-#: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1243
-#: ../libgaim/protocols/oscar/oscar.c:688
-#: ../libgaim/protocols/oscar/oscar.c:5656
-#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/jabber/buddy.c:1411
+#: ../libgaim/protocols/jabber/jabber.c:1265
+#: ../libgaim/protocols/oscar/oscar.c:706
+#: ../libgaim/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/sametime/sametime.c:3319
 msgid "Do Not Disturb"
 msgstr "Ne Ĝenu"
 
-#: ../libgaim/protocols/jabber/buddy.c:1520
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1524
-#: ../libgaim/protocols/jabber/buddy.c:1703
-#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/jabber/buddy.c:1560
+#: ../libgaim/protocols/jabber/buddy.c:1739
+#: ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Last Name"
 msgstr "Familia Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libgaim/protocols/jabber/buddy.c:1592
 msgid "The following are the results of your search"
 msgstr "La janaj estas la rezultoj de via serĉo"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1631
+#: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1651
+#: ../libgaim/protocols/jabber/buddy.c:1687
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1652
+#: ../libgaim/protocols/jabber/buddy.c:1688
 msgid "Could not query the directory server."
 msgstr ""
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1686
+#: ../libgaim/protocols/jabber/buddy.c:1722
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Servilo instrukcioj: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1693
+#: ../libgaim/protocols/jabber/buddy.c:1729
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3635
-#: ../libgaim/protocols/oscar/oscar.c:3642
+#: ../libgaim/protocols/oscar/oscar.c:3708
+#: ../libgaim/protocols/oscar/oscar.c:3717
 msgid "E-Mail Address"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:1722
-#: ../libgaim/protocols/jabber/buddy.c:1723
+#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1759
 msgid "Search for Jabber users"
 msgstr "Serĉu Jabber-ajn uzantojn"
 
-#: ../libgaim/protocols/jabber/buddy.c:1737
+#: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
 msgstr "Malvalida Adreslibro"
 
-#: ../libgaim/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1790
 msgid "Enter a User Directory"
 msgstr "Enigu Uzanto Adreslibro"
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
+#: ../libgaim/protocols/jabber/buddy.c:1791
 msgid "Select a user directory to search"
 msgstr "Elektu uzantan adreslibron serĉendan"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1794
 msgid "Search Directory"
 msgstr "Serŝu Adreslibron"
 
 #: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5139
+#: ../libgaim/protocols/oscar/oscar.c:5228
 #: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Ĉambro:"
@@ -7732,524 +8079,523 @@
 msgid "_Handle:"
 msgstr "_Tenilo:"
 
-#: ../libgaim/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ne estas valida ĉambro nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Malvalida Ĉambro Nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ne estas valida servilo nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:230
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:232
+#: ../libgaim/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Malvalida Servilo Nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ne estas valida ĉambro tenilo"
 
-#: ../libgaim/protocols/jabber/chat.c:236
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:238
+#: ../libgaim/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Malvalida Ĉambro Tenilo"
 
-#: ../libgaim/protocols/jabber/chat.c:396
+#: ../libgaim/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Agorderaro"
 
-#: ../libgaim/protocols/jabber/chat.c:405
-#: ../libgaim/protocols/jabber/chat.c:548
+#: ../libgaim/protocols/jabber/chat.c:407
+#: ../libgaim/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Ne eblas agordi"
 
-#: ../libgaim/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:470
-#: ../libgaim/protocols/jabber/chat.c:539
+#: ../libgaim/protocols/jabber/chat.c:472
+#: ../libgaim/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:627
+#: ../libgaim/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:678
-#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:680
+#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eraro ricevante babilejliston"
 
-#: ../libgaim/protocols/jabber/chat.c:737
+#: ../libgaim/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Malvalida Servilo"
 
-#: ../libgaim/protocols/jabber/chat.c:775
+#: ../libgaim/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Enigu Konferencan Servilon"
 
-#: ../libgaim/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Elektu konferencan servilon petendan"
 
-#: ../libgaim/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-#: ../libgaim/protocols/jabber/jabber.c:81
+#: ../libgaim/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:240
-#: ../libgaim/protocols/jabber/jabber.c:291
-#: ../libgaim/protocols/jabber/jabber.c:319
+#: ../libgaim/protocols/jabber/jabber.c:241
+#: ../libgaim/protocols/jabber/jabber.c:294
+#: ../libgaim/protocols/jabber/jabber.c:322
 msgid "Write error"
 msgstr "Skriberaro"
 
-#: ../libgaim/protocols/jabber/jabber.c:387
-#: ../libgaim/protocols/jabber/jabber.c:424
+#: ../libgaim/protocols/jabber/jabber.c:390
+#: ../libgaim/protocols/jabber/jabber.c:427
 msgid "Read Error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:493
-#: ../libgaim/protocols/jabber/jabber.c:924
+#: ../libgaim/protocols/jabber/jabber.c:504
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:541
-#: ../libgaim/protocols/jabber/jabber.c:884
+#: ../libgaim/protocols/jabber/jabber.c:552
+#: ../libgaim/protocols/jabber/jabber.c:895
 msgid "Invalid Jabber ID"
 msgstr "Malvalida Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrado de %s@%s sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:614
-#: ../libgaim/protocols/jabber/jabber.c:615
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:626
 msgid "Registration Successful"
 msgstr "Registrado Sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:621
-#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:632
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Unknown Error"
 msgstr "Nekonata Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
-#: ../libgaim/protocols/jabber/jabber.c:624
+#: ../libgaim/protocols/jabber/jabber.c:634
+#: ../libgaim/protocols/jabber/jabber.c:635
 msgid "Registration Failed"
 msgstr "Registrado Malsukcesis"
 
-#: ../libgaim/protocols/jabber/jabber.c:739
-#: ../libgaim/protocols/jabber/jabber.c:740
+#: ../libgaim/protocols/jabber/jabber.c:750
+#: ../libgaim/protocols/jabber/jabber.c:751
 msgid "Already Registered"
 msgstr "Jam Registrita"
 
-#: ../libgaim/protocols/jabber/jabber.c:816
-#: ../libgaim/protocols/oscar/oscar.c:3686
-#: ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/jabber/jabber.c:827
+#: ../libgaim/protocols/oscar/oscar.c:3765
+#: ../libgaim/protocols/oscar/oscar.c:3778
 msgid "State"
 msgstr "Ŝato"
 
-#: ../libgaim/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/jabber.c:832
 msgid "Postal code"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:837
 #: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../libgaim/protocols/jabber/jabber.c:836
+#: ../libgaim/protocols/jabber/jabber.c:847
 msgid "Date"
 msgstr "Dato"
 
-#: ../libgaim/protocols/jabber/jabber.c:844
+#: ../libgaim/protocols/jabber/jabber.c:855
 msgid "Please fill out the information below to register your new account."
 msgstr "B.v. plenigi la informon sube por registradi vian novan konton."
 
-#: ../libgaim/protocols/jabber/jabber.c:847
-#: ../libgaim/protocols/jabber/jabber.c:848
+#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libgaim/protocols/jabber/jabber.c:859
 msgid "Register New Jabber Account"
 msgstr "Registradu Novan Jabber-n Konton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1004
+#: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/jabber/jabber.c:1030
 #: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Aŭtentokontrolante"
 
-#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/jabber/jabber.c:1039
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1092
-#: ../libgaim/protocols/jabber/jabber.c:1457
-#: ../libgaim/protocols/jabber/jabber.c:1498
-#: ../libgaim/protocols/jabber/jabber.c:1532
-#: ../libgaim/protocols/oscar/oscar.c:766
-#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/jabber/jabber.c:1109
+#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:5549
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1134
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../libgaim/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From (To pending)"
 msgstr "De (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1141
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "To"
 msgstr "Al"
 
-#: ../libgaim/protocols/jabber/jabber.c:1143
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None (To pending)"
 msgstr "Nenio (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1147
+#: ../libgaim/protocols/jabber/jabber.c:1165
 msgid "Subscription"
 msgstr "Abono"
 
-#: ../libgaim/protocols/jabber/jabber.c:1273
+#: ../libgaim/protocols/jabber/jabber.c:1295
 msgid "Password Changed"
 msgstr "Pasvorto Ŝanĝita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1274
+#: ../libgaim/protocols/jabber/jabber.c:1296
 msgid "Your password has been changed."
 msgstr "Via pasvorto estas ŝanĝita."
 
-#: ../libgaim/protocols/jabber/jabber.c:1278
-#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libgaim/protocols/jabber/jabber.c:1301
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1335
+#: ../libgaim/protocols/jabber/jabber.c:1357
 msgid "Password (again)"
 msgstr "Pasvorton (denove)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1340
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Change Jabber Password"
 msgstr "Ŝanĝu Jabber-n Pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
 msgstr "B.v. tajpi vian novan pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1351
-#: ../libgaim/protocols/oscar/oscar.c:6247
+#: ../libgaim/protocols/jabber/jabber.c:1373
+#: ../libgaim/protocols/oscar/oscar.c:6355
 #: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Difinu Uzanto-Informon..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1356
-#: ../libgaim/protocols/oscar/oscar.c:6258
+#: ../libgaim/protocols/jabber/jabber.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:6366
 #: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Ŝanĝu Pasvorton..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1361
+#: ../libgaim/protocols/jabber/jabber.c:1383
 msgid "Search for Users..."
 msgstr "Serĉu Uzantojn..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1437
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Bad Request"
 msgstr "Malbona Demando"
 
-#: ../libgaim/protocols/jabber/jabber.c:1439
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Conflict"
 msgstr "Konflikto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1463
 msgid "Feature Not Implemented"
 msgstr "Eblo Malrealigita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Gone"
 msgstr "Foririnta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1447
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "Internal Server Error"
 msgstr "Interna Servilo Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Item Not Found"
 msgstr "Ero Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Malformed Jabber ID"
 msgstr "Misformita Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
 msgstr "Ne Aceptinda"
 
-#: ../libgaim/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Not Allowed"
 msgstr "Ne Permesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:1481
 msgid "Payment Required"
 msgstr "Pago Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1483
 msgid "Recipient Unavailable"
 msgstr "Ricevanto maldisponebla"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1487
 msgid "Registration Required"
 msgstr "Registrado Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Remote Server Not Found"
 msgstr "Dista Servia Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1491
 msgid "Remote Server Timeout"
 msgstr "Dista Servilo Ne Respondis"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Service Unavailable"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1475
-msgid "Subscription Required"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1477
-msgid "Unexpected Request"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1484
-msgid "Authorization Aborted"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1486
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1489
-msgid "Invalid authzid"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1492
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
 #: ../libgaim/protocols/jabber/jabber.c:1495
-msgid "Authorization mechanism too weak"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1500
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1503
-msgid "Authentication Failure"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1507
-msgid "Bad Format"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1509
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1512
-msgid "Resource Conflict"
+msgid "Service Unavailable"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1497
+msgid "Subscription Required"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1499
+msgid "Unexpected Request"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1506
+msgid "Authorization Aborted"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1508
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1511
+msgid "Invalid authzid"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1514
-#: ../libgaim/protocols/silc/ops.c:1727
-msgid "Connection Timeout"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1516
-msgid "Host Gone"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1518
-msgid "Host Unknown"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1520
-msgid "Improper Addressing"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1524
-msgid "Invalid ID"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1526
-msgid "Invalid Namespace"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1528
-msgid "Invalid XML"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1530
-msgid "Non-matching Hosts"
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1517
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1522
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1525
+msgid "Authentication Failure"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1529
+msgid "Bad Format"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1531
+msgid "Bad Namespace Prefix"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1534
-msgid "Policy Violation"
+msgid "Resource Conflict"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1536
-msgid "Remote Connection Failed"
+#: ../libgaim/protocols/silc/ops.c:1729
+msgid "Connection Timeout"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1538
-msgid "Resource Constraint"
+msgid "Host Gone"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1540
-msgid "Restricted XML"
+msgid "Host Unknown"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1542
-msgid "See Other Host"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1544
-msgid "System Shutdown"
+msgid "Improper Addressing"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1546
-msgid "Undefined Condition"
+msgid "Invalid ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1548
-msgid "Unsupported Encoding"
+msgid "Invalid Namespace"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1550
-msgid "Unsupported Stanza Type"
+msgid "Invalid XML"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1552
-msgid "Unsupported Version"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1554
-msgid "XML Not Well Formed"
+msgid "Non-matching Hosts"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1556
+msgid "Policy Violation"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1558
+msgid "Remote Connection Failed"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1560
+msgid "Resource Constraint"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1562
+msgid "Restricted XML"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1564
+msgid "See Other Host"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1566
+msgid "System Shutdown"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1568
+msgid "Undefined Condition"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1570
+msgid "Unsupported Encoding"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1572
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1574
+msgid "Unsupported Version"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1576
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1578
 msgid "Stream Error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1645
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1643
+#: ../libgaim/protocols/jabber/jabber.c:1665
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1648
+#: ../libgaim/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1667
+#: ../libgaim/protocols/jabber/jabber.c:1689
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1674
+#: ../libgaim/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1727
+#: ../libgaim/protocols/jabber/jabber.c:1749
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1762
+#: ../libgaim/protocols/jabber/jabber.c:1784
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1793
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1798
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1782
+#: ../libgaim/protocols/jabber/jabber.c:1804
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libgaim/protocols/jabber/jabber.c:1810
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1794
+#: ../libgaim/protocols/jabber/jabber.c:1816
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1800
+#: ../libgaim/protocols/jabber/jabber.c:1822
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1806
+#: ../libgaim/protocols/jabber/jabber.c:1828
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1812
+#: ../libgaim/protocols/jabber/jabber.c:1834
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1818
+#: ../libgaim/protocols/jabber/jabber.c:1840
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1823
+#: ../libgaim/protocols/jabber/jabber.c:1845
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
@@ -8263,27 +8609,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1939
-#: ../libgaim/protocols/jabber/jabber.c:1941
+#: ../libgaim/protocols/jabber/jabber.c:1962
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1967
+#: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
 msgstr "Devigi malnovan (pordo 5223) SSL-n"
 
-#: ../libgaim/protocols/jabber/jabber.c:1972
+#: ../libgaim/protocols/jabber/jabber.c:1995
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
 
-#: ../libgaim/protocols/jabber/jabber.c:1977
-#: ../libgaim/protocols/simple/simple.c:1841
+#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Konekto pordo"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:1981
-#: ../libgaim/protocols/silc/silc.c:1851
+#: ../libgaim/protocols/jabber/jabber.c:2004
+#: ../libgaim/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Konekto servilo"
 
@@ -8316,38 +8662,20 @@
 msgid " (Code %s)"
 msgstr " (Kodo %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:179
+#: ../libgaim/protocols/jabber/parser.c:192
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:304
+#: ../libgaim/protocols/jabber/presence.c:280
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:309
-#: ../libgaim/protocols/msn/userlist.c:98
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "La uzanto %s deziras aldoni %s-n en sia kunullisto."
-
-#: ../libgaim/protocols/jabber/presence.c:318
-#: ../libgaim/protocols/oscar/oscar.c:2359
-#: ../libgaim/protocols/oscar/oscar.c:5070
-msgid "_Authorize"
-msgstr "_Permesu"
-
-#: ../libgaim/protocols/jabber/presence.c:319
-#: ../libgaim/protocols/oscar/oscar.c:2361
-#: ../libgaim/protocols/oscar/oscar.c:5071
-msgid "_Deny"
-msgstr "_Rifuzu"
-
-#: ../libgaim/protocols/jabber/presence.c:376
-#: ../libgaim/protocols/jabber/presence.c:377
+#: ../libgaim/protocols/jabber/presence.c:354
+#: ../libgaim/protocols/jabber/presence.c:355
 msgid "Create New Room"
 msgstr "Kreu Novan Ĉambron"
 
-#: ../libgaim/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:356
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8355,20 +8683,20 @@
 "Vi estas kreante nova ĉambro. Ĉu vi deziras agordi ĝin, aŭ akcepti apriorajn "
 "agordojn?"
 
-#: ../libgaim/protocols/jabber/presence.c:381
+#: ../libgaim/protocols/jabber/presence.c:359
 msgid "_Configure Room"
 msgstr "_Agordu Ĉambron"
 
-#: ../libgaim/protocols/jabber/presence.c:383
+#: ../libgaim/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
-#: ../libgaim/protocols/jabber/presence.c:421
+#: ../libgaim/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "Eraro en babilejo %s"
 
-#: ../libgaim/protocols/jabber/presence.c:424
+#: ../libgaim/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eraro aliĝante babilejon %s"
@@ -8418,24 +8746,24 @@
 msgstr "Uzanto ne ekzistas"
 
 #: ../libgaim/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
+msgid "Fully qualified domain name missing"
 msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:52
-msgid "Already Logged In"
+msgid "Already logged in"
 msgstr "Jam ensalutita"
 
 #: ../libgaim/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "Malvalida Uzantonomo"
+msgid "Invalid screen name"
+msgstr "Malvalida ekranonomo"
 
 #: ../libgaim/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
-msgstr "Malvalida Amika Nomo"
+msgid "Invalid friendly name"
+msgstr "Malvalida amika nomo"
 
 #: ../libgaim/protocols/msn/error.c:61
-msgid "List Full"
-msgstr "Listo Plena"
+msgid "List full"
+msgstr "Listo plena"
 
 #: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
@@ -8487,8 +8815,8 @@
 msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
-msgstr ""
+msgid "Notify transfer failed"
+msgstr "Dosiero transmeto malsukcesis"
 
 #: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
@@ -8498,13 +8826,13 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
 msgid "Not logged in"
 msgstr "Ne ensalutita"
 
 #: ../libgaim/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
-msgstr ""
+msgid "Service temporarily unavailable"
+msgstr "Servilo provizore ne disponebla"
 
 #: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
@@ -8536,7 +8864,7 @@
 msgstr "Servilo disponebla"
 
 #: ../libgaim/protocols/msn/error.c:141
-msgid "Peer Notification server down"
+msgid "Peer notification server down"
 msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:144
@@ -8592,8 +8920,8 @@
 msgstr "Servilo tro okupita"
 
 #: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1312
-#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/protocols/oscar/oscar.c:1355
+#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
 #: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
@@ -8628,103 +8956,90 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Eraro: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:111
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:136
 msgid "Your new MSN friendly name is too long."
 msgstr "Via nova MSN amika nomo estas tro longa."
 
-#: ../libgaim/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:244
 msgid "Set your friendly name."
 msgstr "Difinu vian amikan nomon."
 
-#: ../libgaim/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:245
 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."
 
-#: ../libgaim/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:261
 msgid "Set your home phone number."
 msgstr "Difinu vian hejm telefononombron."
 
-#: ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:276
 msgid "Set your work phone number."
 msgstr "Difinu vian labor telefononombron."
 
-#: ../libgaim/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:291
 msgid "Set your mobile phone number."
 msgstr "Difiniu vian poŝtelefona nombron."
 
-#: ../libgaim/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:304
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:305
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:309
 msgid "Allow"
 msgstr "Permesu"
 
-#: ../libgaim/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:310
 msgid "Disallow"
 msgstr "Malpermesu"
 
-#: ../libgaim/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:326
 msgid "This Hotmail account may not be active."
 msgstr "Tiu Hotmail konto eble ne estas aktiva."
 
+#: ../libgaim/protocols/msn/msn.c:352
+msgid "Send a mobile message."
+msgstr ""
+
 #: ../libgaim/protocols/msn/msn.c:354
-msgid "Send a mobile message."
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Paĝo"
 
-#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
-#: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/sametime/sametime.c:3270
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
-#: ../libgaim/protocols/yahoo/yahoo.c:3038
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
 #: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Havas vin"
 
 #: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2861
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libgaim/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:3460
 msgid "Be Right Back"
 msgstr "Tuj Revenas"
 
 #: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2859
-#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/novell/novell.c:2857
+#: ../libgaim/protocols/novell/novell.c:2987
 #: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2863
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libgaim/protocols/yahoo/yahoo.c:2858
+#: ../libgaim/protocols/yahoo/yahoo.c:3463
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "On the Phone"
 msgstr "Telefonante"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
-#: ../libgaim/protocols/yahoo/yahoo.c:3487
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "Out to Lunch"
 msgstr "Ekstere Tagmanĝanten"
 
@@ -8761,7 +9076,7 @@
 msgstr "Sendu al Poŝtelefono"
 
 #: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3449
+#: ../libgaim/protocols/novell/novell.c:3443
 msgid "Initiate _Chat"
 msgstr "Iniciatu _Babilon"
 
@@ -8775,255 +9090,219 @@
 msgid "Failed to connect to server."
 msgstr "Malsukcesis konekti servilon."
 
-#: ../libgaim/protocols/msn/msn.c:1363
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
-#: ../libgaim/protocols/zephyr/zephyr.c:788
-#: ../libgaim/protocols/zephyr/zephyr.c:1205
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alinomo:</b> %s<br>"
-
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1370
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: ../libgaim/protocols/msn/msn.c:1462
-msgid "MSN Profile"
-msgstr "MSN Profilo"
-
-#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
+#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3671
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
+#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Aĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Okupiĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/msn/msn.c:1542
 #: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
+#: ../libgaim/protocols/zephyr/zephyr.c:799
+#: ../libgaim/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Loko"
 
-#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
-#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
+#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
+#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
 msgid "Hobbies and Interests"
 msgstr "Hobioj kaj Interesiĝoj"
 
-#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
-#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
-#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
+#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
+#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
+#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
 msgid "A Little About Me"
 msgstr "Iomete Pri Mi"
 
-#: ../libgaim/protocols/msn/msn.c:1557
-#, c-format
-msgid "%s<b>General</b><br>%s"
-msgstr "%s<b>Ĝenerala</b><br>%s"
-
-#. Social
-#: ../libgaim/protocols/msn/msn.c:1566
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Social"
+msgstr ""
+
+#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Edzstato"
 
-#: ../libgaim/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Interests"
 msgstr "Interesiĝoj"
 
-#: ../libgaim/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1574
 msgid "Pets"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1575
 msgid "Hometown"
 msgstr "Hejmurbo"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libgaim/protocols/msn/msn.c:1576
 msgid "Places Lived"
 msgstr "Vivintejoj"
 
-#: ../libgaim/protocols/msn/msn.c:1571
+#: ../libgaim/protocols/msn/msn.c:1577
 msgid "Fashion"
 msgstr "Fasono"
 
-#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1578
 msgid "Humor"
 msgstr "Humuro"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libgaim/protocols/msn/msn.c:1579
 msgid "Music"
 msgstr "Muziko"
 
-#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
-#: ../libgaim/protocols/msn/msn.c:1753
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1767
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Favorita Citaĵo"
 
-#: ../libgaim/protocols/msn/msn.c:1578
-#, c-format
-msgid "%s<b>Social</b><br>%s"
-msgstr "%s<b>Sociala</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1597
+msgid "Contact Info"
+msgstr "Kontakto Informo"
+
+#: ../libgaim/protocols/msn/msn.c:1598
+msgid "Personal"
+msgstr "Persona"
+
+#: ../libgaim/protocols/msn/msn.c:1601
 msgid "Significant Other"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1602
 msgid "Home Phone"
 msgstr "Hejmo Telfono"
 
-#: ../libgaim/protocols/msn/msn.c:1589
+#: ../libgaim/protocols/msn/msn.c:1603
 msgid "Home Phone 2"
 msgstr "Hejmo Telfono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
 msgid "Home Address"
 msgstr "Hejmo Adreso"
 
-#: ../libgaim/protocols/msn/msn.c:1591
+#: ../libgaim/protocols/msn/msn.c:1605
 msgid "Personal Mobile"
 msgstr "Persona Poŝtelefono"
 
-#: ../libgaim/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1606
 msgid "Home Fax"
 msgstr "Hejmfakso"
 
-#: ../libgaim/protocols/msn/msn.c:1593
+#: ../libgaim/protocols/msn/msn.c:1607
 msgid "Personal E-Mail"
 msgstr "Persona Retadreso"
 
-#: ../libgaim/protocols/msn/msn.c:1594
+#: ../libgaim/protocols/msn/msn.c:1608
 msgid "Personal IM"
 msgstr "Persona TM"
 
-#: ../libgaim/protocols/msn/msn.c:1596
+#: ../libgaim/protocols/msn/msn.c:1610
 msgid "Anniversary"
 msgstr "Naskiĝdato"
 
-#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
-msgid "Notes"
-msgstr "Notoj"
-
-#: ../libgaim/protocols/msn/msn.c:1601
-#, c-format
-msgid "<br><b>Personal</b><br>%s"
-msgstr "<br><b>Persona</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
+#. Business
+#: ../libgaim/protocols/msn/msn.c:1626
+msgid "Work"
+msgstr "Laboro"
+
+#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Laboro Titolo"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3700
+#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
 msgid "Company"
 msgstr "Kompanio"
 
-#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1630
 #: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departemento"
 
-#: ../libgaim/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1631
 msgid "Profession"
 msgstr "Prefesio"
 
-#: ../libgaim/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1632
 msgid "Work Phone"
 msgstr "Labor Telefono"
 
-#: ../libgaim/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1633
 msgid "Work Phone 2"
 msgstr "Labor Telefono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
 msgid "Work Address"
 msgstr "Laboro Adreso"
 
-#: ../libgaim/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1635
 msgid "Work Mobile"
 msgstr "Laborpoŝtelefono"
 
-#: ../libgaim/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1636
 msgid "Work Pager"
 msgstr "Laborpaĝilo"
 
-#: ../libgaim/protocols/msn/msn.c:1618
+#: ../libgaim/protocols/msn/msn.c:1637
 msgid "Work Fax"
 msgstr "Laborfakso"
 
-#: ../libgaim/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1638
 msgid "Work E-Mail"
 msgstr "Laboro Retadreso"
 
-#: ../libgaim/protocols/msn/msn.c:1620
+#: ../libgaim/protocols/msn/msn.c:1639
 msgid "Work IM"
 msgstr "Laboro TM"
 
-#: ../libgaim/protocols/msn/msn.c:1621
+#: ../libgaim/protocols/msn/msn.c:1640
 msgid "Start Date"
 msgstr "Komenca Dato"
 
-#: ../libgaim/protocols/msn/msn.c:1626
-#, c-format
-msgid "<br><b>Business</b><br>%s"
-msgstr "<br><b>Afero</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1637
-#, c-format
-msgid "<hr><b>Contact Info</b>%s%s"
-msgstr "<hr><b>Kontakt-informo</b>%s%s"
-
-#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
-#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
 msgid "Favorite Things"
 msgstr "Favorataj Aĵoj"
 
-#: ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1775
 msgid "Last Updated"
 msgstr "Laste Aktualigita"
 
-#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
 #: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1798
+#: ../libgaim/protocols/msn/msn.c:1807
 msgid "The user has not created a public profile."
 msgstr "La uzanto ne kreis publikan profilon."
 
-#: ../libgaim/protocols/msn/msn.c:1799
+#: ../libgaim/protocols/msn/msn.c:1808
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1812
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
 
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1808
-#, c-format
-msgid "<hr><b>%s:</b> "
-msgstr "<hr><b>%s:</b> "
-
-#: ../libgaim/protocols/msn/msn.c:1808
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
+#: ../libgaim/protocols/msn/msn.c:1820
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profilo URL"
 
@@ -9037,19 +9316,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/msn/msn.c:2063
+#: ../libgaim/protocols/msn/msn.c:2065
 msgid "Use HTTP Method"
 msgstr "Uzu HTTP-an metodon"
 
-#: ../libgaim/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2070
 msgid "Show custom smileys"
 msgstr "Montru personajn ridmienojn"
 
-#: ../libgaim/protocols/msn/msn.c:2076
+#: ../libgaim/protocols/msn/msn.c:2078
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -9059,15 +9338,15 @@
 #: ../libgaim/protocols/qq/qq_proxy.c:321
 #: ../libgaim/protocols/qq/qq_proxy.c:366
 #: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
@@ -9169,7 +9448,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3411
+#: ../libgaim/protocols/oscar/oscar.c:3467
 #: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Vi ensalutis el alia loko."
@@ -9256,42 +9535,27 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:952
+#: ../libgaim/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/userlist.c:90
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "La uzanto %s (%s) deziras aldoni %s-n en sia kunul listo."
-
-#: ../libgaim/protocols/msn/userlist.c:105
-#: ../libgaim/protocols/yahoo/yahoo.c:1002
-msgid "Authorize"
-msgstr "Permesi"
-
-#: ../libgaim/protocols/msn/userlist.c:106
-#: ../libgaim/protocols/yahoo/yahoo.c:1004
-msgid "Deny"
-msgstr "Rifuzi"
-
-#: ../libgaim/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s aldonis vin en sia kunul listo."
 
-#: ../libgaim/protocols/msn/userlist.c:349
+#: ../libgaim/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s forigis vin el sia kunul listo."
 
-#: ../libgaim/protocols/msn/userlist.c:671
+#: ../libgaim/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Malsukcesis aldoni \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:673
+#: ../libgaim/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr ""
 
@@ -9332,8 +9596,8 @@
 msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1909
-msgid "Invalid password"
-msgstr ""
+msgid "Incorrect password"
+msgstr "Misa pasvorto"
 
 #: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
@@ -9368,16 +9632,16 @@
 msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1937
-msgid "Invalid username or password"
-msgstr ""
+msgid "Incorrect screen name or password"
+msgstr "Misa ekrannomo aŭ pasvorto"
 
 #: ../libgaim/protocols/novell/nmuser.c:1940
-msgid "Could not recognize the host of the username you entered"
+msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1943
 msgid ""
-"Your account has been disabled because too many invalid passwords were "
+"Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 
@@ -9390,7 +9654,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1953
-msgid "You have entered an invalid username"
+msgid "You have entered an incorrect screen name"
 msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1956
@@ -9498,7 +9762,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
@@ -9509,7 +9773,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1697
+#: ../libgaim/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
@@ -9525,52 +9789,52 @@
 msgid "Mailstop"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1505
+#: ../libgaim/protocols/sametime/sametime.c:4142
 msgid "User ID"
 msgstr ""
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
+#. gaim_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
 #: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1673
+#: ../libgaim/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1725
+#: ../libgaim/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "Aŭtentokontrolas..."
 
-#: ../libgaim/protocols/novell/novell.c:1737
+#: ../libgaim/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1740
+#: ../libgaim/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Atendante respondon..."
 
-#: ../libgaim/protocols/novell/novell.c:1875
+#: ../libgaim/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s estas invitita al tiu konversacio."
 
-#: ../libgaim/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr "Invito al Konversacio"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9581,16 +9845,16 @@
 "\n"
 "Sendita: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1906
+#: ../libgaim/protocols/novell/novell.c:1904
 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
-#: ../libgaim/protocols/novell/novell.c:2015
+#: ../libgaim/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2072
+#: ../libgaim/protocols/novell/novell.c:2070
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
@@ -9599,17 +9863,17 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2170
+#: ../libgaim/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2198
+#: ../libgaim/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2507
+#: ../libgaim/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
 
@@ -9623,31 +9887,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3552
-#: ../libgaim/protocols/novell/novell.c:3554
+#: ../libgaim/protocols/novell/novell.c:3548
+#: ../libgaim/protocols/novell/novell.c:3550
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libgaim/protocols/novell/novell.c:3569
 msgid "Server address"
 msgstr "Servilo adreso"
 
-#: ../libgaim/protocols/novell/novell.c:3577
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server port"
 msgstr "Servilo pordo"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:237
-#: ../libgaim/protocols/yahoo/yahoo.c:2268
-#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/oscar/flap_connection.c:379
+#: ../libgaim/protocols/yahoo/yahoo.c:2263
+#: ../libgaim/protocols/yahoo/yahoo.c:2421
 #: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
 #: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
 #: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "Servilo fermis la konekton."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:239
-#: ../libgaim/protocols/yahoo/yahoo.c:2262
-#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
+#: ../libgaim/protocols/oscar/flap_connection.c:381
+#: ../libgaim/protocols/yahoo/yahoo.c:2257
+#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
 #: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
 #: ../libgaim/proxy.c:1425
 #, c-format
@@ -9658,19 +9922,71 @@
 "Perdis konekton kun servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
+#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
 #: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
 #: ../libgaim/proxy.c:1438
 msgid "Received invalid data on connection with server."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/flap_connection.c:244
+#: ../libgaim/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libaim.c:112
+#: ../libgaim/protocols/oscar/libaim.c:114
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protokol-Kromaĵo"
+
+#: ../libgaim/protocols/oscar/libaim.c:140
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Ĉiam uzu AIM/ICQ-n prokurservilon por dosiero alŝuto\n"
+"(pli malrapida, sed vualigas vian IP adreson)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libicq.c:112
+#: ../libgaim/protocols/oscar/libicq.c:114
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protokol-Kromaĵo"
+
+#: ../libgaim/protocols/oscar/libicq.c:139
+#: ../libgaim/protocols/yahoo/yahoo.c:3945
+#: ../libgaim/protocols/zephyr/zephyr.c:2985
+msgid "Encoding"
+msgstr "Kodoprezento"
+
+#: ../libgaim/protocols/oscar/libicq.c:143
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Ĉiam uzi ICQ-n prokurservilon por dosiero alŝutoj\n"
+"(pli malrapida, sed vualigas vian IP adreson)"
+
 #: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "La dista uzanto fermis la konekton."
@@ -9692,112 +10008,112 @@
 msgid "Could not establish a connection with the remote user."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:561
+#: ../libgaim/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Rekta TM establiĝis"
 
-#: ../libgaim/protocols/oscar/oft.c:457
+#: ../libgaim/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
+#: ../libgaim/protocols/oscar/oscar.c:114
+msgid "Invalid error"
+msgstr "Malvalida eraro"
+
+#: ../libgaim/protocols/oscar/oscar.c:115
+msgid "Invalid SNAC"
+msgstr "Malvalida SNAC"
+
+#: ../libgaim/protocols/oscar/oscar.c:116
+msgid "Rate to host"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:117
+msgid "Rate to client"
+msgstr ""
+
 #: ../libgaim/protocols/oscar/oscar.c:119
-msgid "Invalid error"
-msgstr "Malvalida eraro"
+msgid "Service unavailable"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:120
-msgid "Invalid SNAC"
-msgstr "Malvalida SNAC"
+msgid "Service not defined"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:121
-msgid "Rate to host"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:122
-msgid "Rate to client"
+msgid "Not supported by host"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:123
+msgid "Not supported by client"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:124
-msgid "Service unavailable"
+msgid "Refused by client"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:125
-msgid "Service not defined"
+msgid "Reply too big"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:126
-msgid "Obsolete SNAC"
+msgid "Responses lost"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:127
-msgid "Not supported by host"
+msgid "Request denied"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:128
-msgid "Not supported by client"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:129
-msgid "Refused by client"
+msgid "Insufficient rights"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:130
-msgid "Reply too big"
-msgstr ""
+msgid "In local permit/deny"
+msgstr "En loka permeso/rifuzo"
 
 #: ../libgaim/protocols/oscar/oscar.c:131
-msgid "Responses lost"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:132
-msgid "Request denied"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:133
-msgid "Busted SNAC payload"
+msgid "User temporarily unavailable"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:134
-msgid "Insufficient rights"
+msgid "No match"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:135
-msgid "In local permit/deny"
-msgstr "En loka permeso/rifuzo"
+msgid "List overflow"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:136
-msgid "Too evil (sender)"
+msgid "Request ambiguous"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:137
-msgid "Too evil (receiver)"
+msgid "Queue full"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:138
-msgid "User temporarily unavailable"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:139
-msgid "No match"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:140
-msgid "List overflow"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:141
-msgid "Request ambiguous"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:142
-msgid "Queue full"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:321
+#: ../libgaim/protocols/oscar/oscar.c:327
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -9805,131 +10121,132 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:424
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:603
+#: ../libgaim/protocols/oscar/oscar.c:436
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:621
 msgid "Voice"
 msgstr "Voĉo"
 
-#: ../libgaim/protocols/oscar/oscar.c:606
+#: ../libgaim/protocols/oscar/oscar.c:624
 msgid "AIM Direct IM"
 msgstr "AIM Rekta TM"
 
-#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Babilado"
 
-#: ../libgaim/protocols/oscar/oscar.c:612
-#: ../libgaim/protocols/oscar/oscar.c:5854
+#: ../libgaim/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "Get File"
 msgstr "Ricevu Dosieron"
 
-#: ../libgaim/protocols/oscar/oscar.c:619
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Games"
 msgstr "Ludoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:622
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "Add-Ins"
 msgstr "Enaldonaĵoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:625
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Send Buddy List"
 msgstr "Sendu Kunulliston"
 
-#: ../libgaim/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "ICQ Direct Connect"
 msgstr "ICQ Rekta Konekto"
 
-#: ../libgaim/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "AP User"
 msgstr "AP Uzanto"
 
-#: ../libgaim/protocols/oscar/oscar.c:634
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Nihilist"
 msgstr "Nihilisto"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "ICQ Server Relay"
 msgstr "ICQ Servilo Reludo"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libgaim/protocols/oscar/oscar.c:661
 msgid "Old ICQ UTF8"
 msgstr "Malnova ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libgaim/protocols/oscar/oscar.c:664
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libgaim/protocols/oscar/oscar.c:667
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libgaim/protocols/oscar/oscar.c:670
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libgaim/protocols/oscar/oscar.c:673
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:676
 msgid "Video Chat"
 msgstr "Video Babilado"
 
-#: ../libgaim/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:680
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:683
 msgid "Live Video"
 msgstr "Viva Video"
 
-#: ../libgaim/protocols/oscar/oscar.c:668
-msgid "Camera"
-msgstr "Kamerao"
-
 #: ../libgaim/protocols/oscar/oscar.c:686
-#: ../libgaim/protocols/oscar/oscar.c:5631
+msgid "Camera"
+msgstr "Kamerao"
+
+#: ../libgaim/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:5735
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:690
-#: ../libgaim/protocols/oscar/oscar.c:5663
+#: ../libgaim/protocols/oscar/oscar.c:708
+#: ../libgaim/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Ne Disponebla"
 
-#: ../libgaim/protocols/oscar/oscar.c:692
-#: ../libgaim/protocols/oscar/oscar.c:5649
+#: ../libgaim/protocols/oscar/oscar.c:710
+#: ../libgaim/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Okupata"
 
-#: ../libgaim/protocols/oscar/oscar.c:696
+#: ../libgaim/protocols/oscar/oscar.c:714
 msgid "Web Aware"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:700
+#: ../libgaim/protocols/oscar/oscar.c:718
 msgid "Online"
 msgstr "Enrete"
 
-#: ../libgaim/protocols/oscar/oscar.c:786
-#: ../libgaim/protocols/oscar/oscar.c:2806
+#: ../libgaim/protocols/oscar/oscar.c:824
+#: ../libgaim/protocols/oscar/oscar.c:2852
 msgid "Warning Level"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:834
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#: ../libgaim/protocols/oscar/oscar.c:931
+#: ../libgaim/protocols/oscar/oscar.c:974
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9938,7 +10255,7 @@
 "Ne povis konekti al aŭtentokontrolo servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:939
+#: ../libgaim/protocols/oscar/oscar.c:982
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9947,20 +10264,20 @@
 "Ne povis konekti al BOS servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:979
+#: ../libgaim/protocols/oscar/oscar.c:1022
 msgid "Screen name sent"
 msgstr "Ekrannomo sendita"
 
-#: ../libgaim/protocols/oscar/oscar.c:984
+#: ../libgaim/protocols/oscar/oscar.c:1027
 msgid "Connection established, cookie sent"
 msgstr "Konekto estabilta, kuketo sendita"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1013
+#: ../libgaim/protocols/oscar/oscar.c:1056
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1197
+#: ../libgaim/protocols/oscar/oscar.c:1240
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9968,140 +10285,125 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1282
+#: ../libgaim/protocols/oscar/oscar.c:1325
+#: ../libgaim/protocols/yahoo/yahoo.c:1900
 msgid "Invalid screen name."
 msgstr "Malvalida ekranonomo."
 
-#: ../libgaim/protocols/oscar/oscar.c:1289
-#: ../libgaim/protocols/qq/login_logout.c:479
+#: ../libgaim/protocols/oscar/oscar.c:1332
+#: ../libgaim/protocols/qq/login_logout.c:483
 #: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1928
+#: ../libgaim/protocols/yahoo/yahoo.c:1923
 msgid "Incorrect password."
 msgstr "Misa pasvorto."
 
-#: ../libgaim/protocols/oscar/oscar.c:1294
+#: ../libgaim/protocols/oscar/oscar.c:1337
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1298
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tuj Mesaĝilo servo estas provizore nedisponebla."
 
-#: ../libgaim/protocols/oscar/oscar.c:1303
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1308
+#: ../libgaim/protocols/oscar/oscar.c:1351
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1343
-msgid "Could Not Connect"
-msgstr "Ne Povas Konekti"
-
-#: ../libgaim/protocols/oscar/oscar.c:1348
-msgid "Received authorization"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:1371
-msgid "The SecurID key entered is invalid."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:1385
-msgid "Enter SecurID"
-msgstr ""
-
 #: ../libgaim/protocols/oscar/oscar.c:1386
+msgid "Could Not Connect"
+msgstr "Ne Povas Konekti"
+
+#: ../libgaim/protocols/oscar/oscar.c:1391
+msgid "Received authorization"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:1414
+msgid "The SecurID key entered is invalid."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:1428
+msgid "Enter SecurID"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:1429
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1426
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2279
+#: ../libgaim/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+msgid "_OK"
+msgstr "_Daŭrigu"
+
 #: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1512
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
 #: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1515
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1558
+#: ../libgaim/protocols/oscar/oscar.c:1601
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1561
+#: ../libgaim/protocols/oscar/oscar.c:1604
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1587
+#: ../libgaim/protocols/oscar/oscar.c:1630
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
-#: ../libgaim/protocols/oscar/oscar.c:1643
+#: ../libgaim/protocols/oscar/oscar.c:1686
 msgid "Unable to initialize connection"
 msgstr "Ne povas eki konekton"
 
-#: ../libgaim/protocols/oscar/oscar.c:2141
+#: ../libgaim/protocols/oscar/oscar.c:2203
 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."
 
-#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2231
 msgid "Authorization Request Message:"
 msgstr "Permeso Demando Mesaĝo:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2232
 msgid "Please authorize me!"
 msgstr "B.v. permesu min!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2183
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:2188
-msgid "Request Authorization"
-msgstr "Demandu Permeson"
-
-#: ../libgaim/protocols/oscar/oscar.c:2190
-msgid "_Request Authorization"
-msgstr "_Demandu Permeson"
-
-#: ../libgaim/protocols/oscar/oscar.c:2231
-#: ../libgaim/protocols/oscar/oscar.c:2238
-#: ../libgaim/protocols/oscar/oscar.c:2345
-#: ../libgaim/protocols/oscar/oscar.c:2369
-#: ../libgaim/protocols/oscar/oscar.c:5056
-#: ../libgaim/protocols/oscar/oscar.c:5108
+#: ../libgaim/protocols/oscar/oscar.c:2271
+#: ../libgaim/protocols/oscar/oscar.c:2278
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/yahoo/yahoo.c:959
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
-#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:2277
 msgid "Authorization Denied Message:"
 msgstr "Permeso Rifuzo Mesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2347
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:2357
-#: ../libgaim/protocols/oscar/oscar.c:5068
-msgid "Authorization Request"
-msgstr "Permeso Demando"
-
-#: ../libgaim/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10109,17 +10411,17 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2370
+#: ../libgaim/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ permeso rifuzita."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2377
+#: ../libgaim/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2385
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10128,7 +10430,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2393
+#: ../libgaim/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10137,7 +10439,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2401
+#: ../libgaim/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10146,261 +10448,260 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2422
+#: ../libgaim/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libgaim/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2432
+#: ../libgaim/protocols/oscar/oscar.c:2467
 msgid "_Decline"
 msgstr "_Rifuzi"
 
-#: ../libgaim/protocols/oscar/oscar.c:2516
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2525
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2534
+#: ../libgaim/protocols/oscar/oscar.c:2569
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2543
+#: ../libgaim/protocols/oscar/oscar.c:2578
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2552
+#: ../libgaim/protocols/oscar/oscar.c:2587
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2561
+#: ../libgaim/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2617
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Stato:</B> %s<HR>%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2678
+#: ../libgaim/protocols/oscar/oscar.c:2718
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2714
+#: ../libgaim/protocols/oscar/oscar.c:2758
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne eblas sendi mesaĝon: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2714
-#: ../libgaim/protocols/oscar/oscar.c:2719
-#: ../libgaim/protocols/oscar/oscar.c:2781
-#: ../libgaim/protocols/oscar/oscar.c:2785
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libgaim/protocols/oscar/oscar.c:2763
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libgaim/protocols/oscar/oscar.c:2829
 msgid "Unknown reason."
 msgstr "Nekonata kialo."
 
-#: ../libgaim/protocols/oscar/oscar.c:2717
-#: ../libgaim/protocols/sametime/sametime.c:2398
+#: ../libgaim/protocols/oscar/oscar.c:2761
+#: ../libgaim/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ne eblas sendi mesaĝon al %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2781
+#: ../libgaim/protocols/oscar/oscar.c:2825
 #, c-format
 msgid "User information not available: %s"
 msgstr "Uzantoinformo ne disponebla: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2784
+#: ../libgaim/protocols/oscar/oscar.c:2828
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Uzantoinformo des %s ne disponeblas:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2810
+#: ../libgaim/protocols/oscar/oscar.c:2857
 msgid "Online Since"
 msgstr "Enrete Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2815
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
+#: ../libgaim/protocols/oscar/oscar.c:2862
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2820
+#: ../libgaim/protocols/oscar/oscar.c:2867
 msgid "Capabilities"
 msgstr "Kapablecoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2838
+#: ../libgaim/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "Disponeblaj Mesaĝoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2938
+#: ../libgaim/protocols/oscar/oscar.c:2911
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../libgaim/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3119
+#: ../libgaim/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3340
+#: ../libgaim/protocols/oscar/oscar.c:3396
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3341
+#: ../libgaim/protocols/oscar/oscar.c:3397
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3413
+#: ../libgaim/protocols/oscar/oscar.c:3469
 msgid "You have been signed off for an unknown reason."
 msgstr "Vi estas malsalutigita pro nekonata kialo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3426 ../libgaim/protocols/toc/toc.c:977
+#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vi estas diskonektita de babilejo %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/oscar/oscar.c:3723
 #: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../libgaim/protocols/oscar/oscar.c:3674
+#: ../libgaim/protocols/oscar/oscar.c:3753
 msgid "Personal Web Page"
 msgstr "Persona ttt-ejo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3678
-#: ../libgaim/protocols/qq/buddy_info.c:38
+#: ../libgaim/protocols/oscar/oscar.c:3758
+#: ../libgaim/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Kroma Informo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3687
-#: ../libgaim/protocols/oscar/oscar.c:3695
+#: ../libgaim/protocols/oscar/oscar.c:3766
+#: ../libgaim/protocols/oscar/oscar.c:3779
 msgid "Zip Code"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3699
+#: ../libgaim/protocols/oscar/oscar.c:3790
+msgid "Division"
+msgstr "Dividaĵo"
+
+#: ../libgaim/protocols/oscar/oscar.c:3791
+msgid "Position"
+msgstr "Pozicio"
+
+#: ../libgaim/protocols/oscar/oscar.c:3793
+msgid "Web Page"
+msgstr "TTT-ejo"
+
+#: ../libgaim/protocols/oscar/oscar.c:3796
 msgid "Work Information"
 msgstr "Laborinformo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3701
-msgid "Division"
-msgstr "Dividaĵo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3702
-msgid "Position"
-msgstr "Pozicio"
-
-#: ../libgaim/protocols/oscar/oscar.c:3704
-msgid "Web Page"
-msgstr "TTT-ejo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3762
+#: ../libgaim/protocols/oscar/oscar.c:3852
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3802
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "La jena ekrannomo estas kunligita kun %s"
 msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3807
+#: ../libgaim/protocols/oscar/oscar.c:3897
 msgid "Screen name"
 msgstr "Ekrannomo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3833
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3854
+#: ../libgaim/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3856
+#: ../libgaim/protocols/oscar/oscar.c:3946
 msgid "Account Confirmation Requested"
 msgstr "Kontokonfirmo demandita"
 
-#: ../libgaim/protocols/oscar/oscar.c:3887
+#: ../libgaim/protocols/oscar/oscar.c:3977
 msgid "Error Changing Account Info"
 msgstr "Eraro ŝanĝante kontoinformon"
 
-#: ../libgaim/protocols/oscar/oscar.c:3890
+#: ../libgaim/protocols/oscar/oscar.c:3980
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3893
+#: ../libgaim/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3896
+#: ../libgaim/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3899
+#: ../libgaim/protocols/oscar/oscar.c:3989
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3902
+#: ../libgaim/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3905
+#: ../libgaim/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3908
+#: ../libgaim/protocols/oscar/oscar.c:3998
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eraro 0x%04x: Nekonata eraro."
 
-#: ../libgaim/protocols/oscar/oscar.c:3918
+#: ../libgaim/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -10409,32 +10710,32 @@
 "Via ekrannomo estas nun formatumita tiel:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3919
-#: ../libgaim/protocols/oscar/oscar.c:3926
+#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libgaim/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "Konto Informo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3924
+#: ../libgaim/protocols/oscar/oscar.c:4014
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La retadreso de %s estas %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4099
+#: ../libgaim/protocols/oscar/oscar.c:4189
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4351
+#: ../libgaim/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM profile."
 msgstr "Ne eblas difini AIM-an profilon."
 
-#: ../libgaim/protocols/oscar/oscar.c:4352
+#: ../libgaim/protocols/oscar/oscar.c:4442
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4366
+#: ../libgaim/protocols/oscar/oscar.c:4456
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10445,11 +10746,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4371
+#: ../libgaim/protocols/oscar/oscar.c:4461
 msgid "Profile too long."
 msgstr "Profilo tro longa."
 
-#: ../libgaim/protocols/oscar/oscar.c:4415
+#: ../libgaim/protocols/oscar/oscar.c:4505
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10460,11 +10761,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4420
+#: ../libgaim/protocols/oscar/oscar.c:4510
 msgid "Away message too long."
 msgstr "Formesaĝo tro longa."
 
-#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4579
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10472,45 +10773,45 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4491
-#: ../libgaim/protocols/oscar/oscar.c:4904
-#: ../libgaim/protocols/oscar/oscar.c:4918
+#: ../libgaim/protocols/oscar/oscar.c:4581
+#: ../libgaim/protocols/oscar/oscar.c:5004
+#: ../libgaim/protocols/oscar/oscar.c:5018
 msgid "Unable To Add"
 msgstr "Ne eblas Aldoni"
 
-#: ../libgaim/protocols/oscar/oscar.c:4595
+#: ../libgaim/protocols/oscar/oscar.c:4685
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne eblas Ricevi Kunulliston"
 
-#: ../libgaim/protocols/oscar/oscar.c:4596
+#: ../libgaim/protocols/oscar/oscar.c:4686
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4799
-#: ../libgaim/protocols/oscar/oscar.c:4800
-#: ../libgaim/protocols/oscar/oscar.c:4805
-#: ../libgaim/protocols/oscar/oscar.c:4972
-#: ../libgaim/protocols/oscar/oscar.c:4973
-#: ../libgaim/protocols/oscar/oscar.c:4978
+#: ../libgaim/protocols/oscar/oscar.c:4890
+#: ../libgaim/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4896
+#: ../libgaim/protocols/oscar/oscar.c:5072
+#: ../libgaim/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5078
 msgid "Orphans"
 msgstr "Senpatroj"
 
-#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:5002
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4902
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libgaim/protocols/oscar/oscar.c:5016
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:5016
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10518,38 +10819,29 @@
 "buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5009
+#: ../libgaim/protocols/oscar/oscar.c:5109
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5015
+#: ../libgaim/protocols/oscar/oscar.c:5115
 msgid "Authorization Given"
 msgstr "Permeso Donita"
 
-#: ../libgaim/protocols/oscar/oscar.c:5059
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"La uzanto %s deziras aldoni %s-n al sia listo pro la jena kialo:\n"
-"%s"
-
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5104
+#: ../libgaim/protocols/oscar/oscar.c:5193
 #, 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."
 
-#: ../libgaim/protocols/oscar/oscar.c:5105
+#: ../libgaim/protocols/oscar/oscar.c:5194
 msgid "Authorization Granted"
 msgstr "Aŭtentigo Koncedita"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5108
+#: ../libgaim/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10560,181 +10852,775 @@
 "jena kialo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libgaim/protocols/oscar/oscar.c:5198
 msgid "Authorization Denied"
 msgstr "Permeso Rifuzita"
 
-#: ../libgaim/protocols/oscar/oscar.c:5145 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Interŝanĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5185
+#: ../libgaim/protocols/oscar/oscar.c:5274
 msgid "Invalid chat name specified."
 msgstr "Malvalida babilejonomo enigita."
 
-#: ../libgaim/protocols/oscar/oscar.c:5255
+#: ../libgaim/protocols/oscar/oscar.c:5344
 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."
-
-#: ../libgaim/protocols/oscar/oscar.c:5417
+msgstr ""
+"Via TM-a Bildo ne estis sendita. Vi ne povas sendi TM-ajn Bildojn en AIM "
+"babilejoj."
+
+#: ../libgaim/protocols/oscar/oscar.c:5516
+#: ../libgaim/protocols/oscar/oscar.c:5521
+msgid "Away Message"
+msgstr "Formesaĝo"
+
+#: ../libgaim/protocols/oscar/oscar.c:5521
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(ricevante)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5730
+#: ../libgaim/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kunul Komento por %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Kunul Komento:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5777
+#: ../libgaim/protocols/oscar/oscar.c:5881
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vi elektis malfermi Rektan TM konekton kun %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5781
+#: ../libgaim/protocols/oscar/oscar.c:5885
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5785
-#: ../libgaim/protocols/oscar/peer.c:990
-msgid "_Connect"
-msgstr "_Konektu"
-
-#: ../libgaim/protocols/oscar/oscar.c:5819
+#: ../libgaim/protocols/oscar/oscar.c:5889
+msgid "C_onnect"
+msgstr "K_onektu"
+
+#: ../libgaim/protocols/oscar/oscar.c:5924
 msgid "Get AIM Info"
 msgstr "Ricevu AIM Informon"
 
-#: ../libgaim/protocols/oscar/oscar.c:5825
-msgid "Edit Buddy Comment"
-msgstr "Redaktu Kunul Komenton"
-
-#: ../libgaim/protocols/oscar/oscar.c:5833
-msgid "Get Status Msg"
-msgstr "Ricevi Statan Mesaĝon"
-
-#: ../libgaim/protocols/oscar/oscar.c:5846
-msgid "Direct IM"
-msgstr "Rekta TM"
-
-#: ../libgaim/protocols/oscar/oscar.c:5868
-msgid "Re-request Authorization"
-msgstr "Re-petu aŭtentigon"
-
-#: ../libgaim/protocols/oscar/oscar.c:5927
-msgid "Require authorization"
-msgstr "Petu aŭtentigon"
-
 #: ../libgaim/protocols/oscar/oscar.c:5930
+msgid "Edit Buddy Comment"
+msgstr "Redaktu Kunul Komenton"
+
+#: ../libgaim/protocols/oscar/oscar.c:5938
+msgid "Get Status Msg"
+msgstr "Ricevi Statan Mesaĝon"
+
+#: ../libgaim/protocols/oscar/oscar.c:5951
+msgid "Direct IM"
+msgstr "Rekta TM"
+
+#: ../libgaim/protocols/oscar/oscar.c:5973
+msgid "Re-request Authorization"
+msgstr "Re-petu aŭtentigon"
+
+#: ../libgaim/protocols/oscar/oscar.c:6032
+msgid "Require authorization"
+msgstr "Petu aŭtentigon"
+
+#: ../libgaim/protocols/oscar/oscar.c:6035
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:6040
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatecaj Opcioj"
 
-#: ../libgaim/protocols/oscar/oscar.c:5952
+#: ../libgaim/protocols/oscar/oscar.c:6057
 msgid "The new formatting is invalid."
 msgstr "La nova formatumo malvalidas."
 
-#: ../libgaim/protocols/oscar/oscar.c:5953
+#: ../libgaim/protocols/oscar/oscar.c:6058
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6065
 msgid "New screen name formatting:"
 msgstr "Nova ekrana nomo formatumo:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/oscar/oscar.c:6121
 msgid "Change Address To:"
 msgstr "Ŝanĝu adreson al:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6061
+#: ../libgaim/protocols/oscar/oscar.c:6166
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vi ne atendas aŭtentigon</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6064
+#: ../libgaim/protocols/oscar/oscar.c:6169
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vi atendas aŭtentigon de la jenaj kunuloj"
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
+#: ../libgaim/protocols/oscar/oscar.c:6170
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin "
-"kaj elekti \"Re-petu aŭtentigon.\""
-
-#: ../libgaim/protocols/oscar/oscar.c:6082
+"Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin kaj "
+"elekti \"Re-petu aŭtentigon.\""
+
+#: ../libgaim/protocols/oscar/oscar.c:6187
 msgid "Find Buddy by E-Mail"
 msgstr "Trovu kunulon laŭ Retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6083
+#: ../libgaim/protocols/oscar/oscar.c:6188
 msgid "Search for a buddy by e-mail address"
 msgstr "Serĉu kunulon laŭ retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6084
+#: ../libgaim/protocols/oscar/oscar.c:6189
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 
-#: ../libgaim/protocols/oscar/oscar.c:6253
+#: ../libgaim/protocols/oscar/oscar.c:6192
+msgid "_Search"
+msgstr "_Serĉu"
+
+#: ../libgaim/protocols/oscar/oscar.c:6361
 msgid "Set User Info (URL)..."
 msgstr "Difinu Uzanto-Informon (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6264
+#: ../libgaim/protocols/oscar/oscar.c:6372
 msgid "Change Password (URL)"
 msgstr "Ŝanĝu Pasvorton (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6268
+#: ../libgaim/protocols/oscar/oscar.c:6376
 msgid "Configure IM Forwarding (URL)"
 msgstr "Agordu TM Plusendado (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6278
+#: ../libgaim/protocols/oscar/oscar.c:6386
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6285
+#: ../libgaim/protocols/oscar/oscar.c:6393
 msgid "Format Screen Name..."
 msgstr "Formatu Ekrano-Nomon..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6289
+#: ../libgaim/protocols/oscar/oscar.c:6397
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
 
-#: ../libgaim/protocols/oscar/oscar.c:6293
+#: ../libgaim/protocols/oscar/oscar.c:6401
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vidigu Aktualajn Aliĝintajn Retadresojn"
 
-#: ../libgaim/protocols/oscar/oscar.c:6297
+#: ../libgaim/protocols/oscar/oscar.c:6405
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ŝanĝu Aktualajn Aliĝintajn Retadresojn.."
 
-#: ../libgaim/protocols/oscar/oscar.c:6304
+#: ../libgaim/protocols/oscar/oscar.c:6412
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Montru Kunulojn Atendante Permeso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6310
+#: ../libgaim/protocols/oscar/oscar.c:6418
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6315
+#: ../libgaim/protocols/oscar/oscar.c:6423
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6383
+#: ../libgaim/protocols/oscar/oscar.c:6491
 msgid "Use recent buddies group"
 msgstr "Uzu ĵusan kunulgrupon"
 
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libgaim/protocols/oscar/oscar.c:6494
 msgid "Show how long you have been idle"
 msgstr "Montru kiom longa vi estis senfara"
 
+#: ../libgaim/protocols/oscar/peer.c:674
+#, 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."
+
+#: ../libgaim/protocols/oscar/peer.c:759
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Provas konekti al %s:%hu"
+
+#: ../libgaim/protocols/oscar/peer.c:833
+msgid "Attempting to connect via proxy server."
+msgstr "Provas konekti pere de prokurservilo."
+
+#: ../libgaim/protocols/oscar/peer.c:1010
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s ĵus petis rektan konekton al %s"
+
+#: ../libgaim/protocols/oscar/peer.c:1014
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/peer.c:1020
+msgid "_Connect"
+msgstr "_Konektu"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Primary Information"
+msgstr "Ĉefa Informo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:41
+msgid "Personal Introduction"
+msgstr "Persono Enkonduko"
+
+#: ../libgaim/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr "QQ Nombro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:47
+msgid "Country/Region"
+msgstr "Lando/Regiono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr "Provinco/Ŝtato"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr "Horoskopa Simbolo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr "Zodiaka Signo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr "Sanga Tipo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:54
+msgid "College"
+msgstr "Kolegio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Email"
+msgstr "Retadreso"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "Poŝtkodo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "Poŝtelefona Numero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:59
+msgid "Phone Number"
+msgstr "Telefonnumero"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr "Verŝisto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Pisces"
+msgstr "Fiŝoj"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aries"
+msgstr "Ŝafo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Taurus"
+msgstr "Bovo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Gemini"
+msgstr "Ĝemeloj "
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Cancer"
+msgstr "Kankro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr "Leono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr "Virgulino"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr "Pesilo "
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Scorpio"
+msgstr "Skorpio "
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr "Pafisto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr "Kaprikorno"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rat"
+msgstr "Rato"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Tiger"
+msgstr "Tigro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr "Kuniklo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr "Drako"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Snake"
+msgstr "Serpento"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Horse"
+msgstr "Ĉevalo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr "Kapro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Monkey"
+msgstr "Simio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Rooster"
+msgstr "Virkoko"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr "Hundo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Pig"
+msgstr "Porko"
+
+#: ../libgaim/protocols/qq/buddy_info.c:78
+msgid "Other"
+msgstr "Alia"
+
+#: ../libgaim/protocols/qq/buddy_info.c:481
+#: ../libgaim/protocols/qq/buddy_info.c:482
+msgid "Modify my information"
+msgstr "Ŝanĝu mian informon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:483
+msgid "Update my information"
+msgstr "Aktualigi mian informon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:506
+msgid "Your information has been updated"
+msgstr "Via informo estas aktualigita."
+
+#: ../libgaim/protocols/qq/buddy_info.c:565
+msgid ""
+"You are attempting to set a custom face. Gaim currently only allows the "
+"standard faces. Please choose an image from "
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:582
+#: ../libgaim/protocols/qq/buddy_info.c:595
+msgid "Invalid QQ Face"
+msgstr "Malvalida QQ Aspekto"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
+#, c-format
+msgid "You rejected %d's request"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
+msgid "Input your reason:"
+msgstr "Enigu vian kialon:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+msgid "Reject request"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
+msgid "Sorry, you are not my type..."
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Reject"
+msgstr "Malakceptu"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:272
+msgid "Add buddy with auth request fails"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:303
+msgid "You have successfully removed a buddy"
+msgstr "Vi sukcese forigis kunulon"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:331
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#, c-format
+msgid "User %d needs authentication"
+msgstr "Uzanto %d bezonas aŭtentokontrolon"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+msgid "Input request here"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
+msgid "Would you be my friend?"
+msgstr "Ĉu vi estus mia amiko?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
+msgid "Send"
+msgstr "Sendu"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:406
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "Vi aldonis %d-n en kunullisto"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:503
+msgid "QQid Error"
+msgstr "QQid Eraro"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:504
+msgid "Invalid QQid"
+msgstr "Malvalida QQid"
+
+#: ../libgaim/protocols/qq/group.c:65
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Group ID"
+msgstr "Grupo ID"
+
+#: ../libgaim/protocols/qq/group.c:100
+msgid "Creator"
+msgstr "Kreanto"
+
+#: ../libgaim/protocols/qq/group.c:103
+msgid "Group Description"
+msgstr "Grupo Priskribo"
+
+#: ../libgaim/protocols/qq/group.c:109
+msgid "Auth"
+msgstr "Permesi"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:120
+msgid "Please input external group ID"
+msgstr "B.v. enigi eksteran groupon ID-n"
+
+#: ../libgaim/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:122
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "Uzanto %d aliĝpetis grupon %d"
+
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
+#, c-format
+msgid "Reason: %s"
+msgstr "Kialo: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
+msgid "QQ Qun Operation"
+msgstr "QQ Qun Operacio"
+
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+msgid "Approve"
+msgstr "Aprobi"
+
+#: ../libgaim/protocols/qq/group_im.c:171
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:212
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:248
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:282
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:283
+msgid "This group has been added to your buddy list"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:41
+msgid "I am not member"
+msgstr "Mi ne estas membro"
+
+#: ../libgaim/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr "Mi estas membro"
+
+#: ../libgaim/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr "Mi aliĝpetas"
+
+#: ../libgaim/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:53
+msgid "Unknown status"
+msgstr "Nekonata stato"
+
+#: ../libgaim/protocols/qq/group_join.c:80
+msgid "This group does not allow others to join"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:229
+msgid "You have successfully exited the group"
+msgstr "Vi sukcese forlasis la grupon"
+
+#: ../libgaim/protocols/qq/group_join.c:253
+msgid "QQ Group Auth"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:254
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:325
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid "Are you sure to exit this Qun?"
+msgstr "Ĉu vi certas vi volas forigi tiun Qun-on?"
+
+#: ../libgaim/protocols/qq/group_join.c:358
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr "Daŭrigu"
+
+#: ../libgaim/protocols/qq/group_network.c:90
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Kodo [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:91
+msgid "Group Operation Error"
+msgstr "Grupoperacio Eraro"
+
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:230
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:300
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:389
+msgid "Would you like to set up the Qun details now?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:390
+msgid "Setup"
+msgstr "Agordo"
+
+#: ../libgaim/protocols/qq/im.c:423
+msgid "System Message"
+msgstr "Sistemo Mesaĝo"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Server ACK"
+msgstr "Servilo ACK"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Send IM fail\n"
+msgstr "TM Sendo malsukcesis\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2351
+#: ../libgaim/protocols/yahoo/yahoo.c:2378
+#: ../libgaim/protocols/yahoo/yahoo.c:2485
+#: ../libgaim/protocols/yahoo/yahoo.c:2506
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Ne konekteblas."
+
+#: ../libgaim/protocols/qq/qq.c:186
+#, c-format
+msgid "Unknown-%d"
+msgstr "Nekonata-%d"
+
+#: ../libgaim/protocols/qq/qq.c:209
+#, c-format
+msgid "%s Address"
+msgstr "%s Adreso"
+
+#: ../libgaim/protocols/qq/qq.c:240
+msgid "Level"
+msgstr "Nivelo"
+
+#: ../libgaim/protocols/qq/qq.c:294
+msgid "QQ: Available"
+msgstr "QQ: Disponebla"
+
+#: ../libgaim/protocols/qq/qq.c:298
+msgid "QQ: Away"
+msgstr "QQ: Fora"
+
+#: ../libgaim/protocols/qq/qq.c:302
+msgid "QQ: Invisible"
+msgstr "QQ: Nevidebla"
+
+#: ../libgaim/protocols/qq/qq.c:306
+msgid "QQ: Offline"
+msgstr "QQ: Senkonekta"
+
+#: ../libgaim/protocols/qq/qq.c:383
+msgid "Invalid name"
+msgstr "Malvalida Uzantonomo"
+
+#: ../libgaim/protocols/qq/qq.c:450
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:451
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:455
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:456
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:462
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:463
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:464
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:468
+msgid "Login Information"
+msgstr "Ensaluta Informo"
+
+#: ../libgaim/protocols/qq/qq.c:543
+msgid "Modify My Information"
+msgstr "Ŝanĝu Mian Informon"
+
+#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:549
+msgid "Show Login Information"
+msgstr "Montru Ensalutan Informon"
+
+#: ../libgaim/protocols/qq/qq.c:570
+msgid "Exit this QQ Qun"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10745,656 +11631,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/oscar.c:6512
-#: ../libgaim/protocols/oscar/oscar.c:6514
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ Protokol-Kromaĵo"
-
-#: ../libgaim/protocols/oscar/oscar.c:6539
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
-#: ../libgaim/protocols/zephyr/zephyr.c:2980
-msgid "Encoding"
-msgstr "Kodoprezento"
-
-#: ../libgaim/protocols/oscar/oscar.c:6543
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Ĉiam uzu AIM/ICQ-n prokurservilon por dosiero alŝuto\n"
-"(pli malrapida, sed vualigas vian IP adreson)"
-
-#: ../libgaim/protocols/oscar/peer.c:623
-#, 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."
-
-#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
-#, c-format
-msgid "Attempting to connect to %s:%hu."
-msgstr "Provas konekti al %s:%hu"
-
-#: ../libgaim/protocols/oscar/peer.c:803
-msgid "Attempting to connect via proxy server."
-msgstr "Provas konekti pere de prokurservilo."
-
-#: ../libgaim/protocols/oscar/peer.c:980
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s ĵus petis rektan konekton al %s"
-
-#: ../libgaim/protocols/oscar/peer.c:984
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:37
-msgid "Primary Information"
-msgstr "Ĉefa Informo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:39
-msgid "Personal Introduction"
-msgstr "Persono Enkonduko"
-
-#: ../libgaim/protocols/qq/buddy_info.c:40
-msgid "QQ Number"
-msgstr "QQ Nombro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:45
-msgid "Country/Region"
-msgstr "Lando/Regiono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:46
-msgid "Province/State"
-msgstr "Provinco/Ŝtato"
-
-#: ../libgaim/protocols/qq/buddy_info.c:48
-msgid "Horoscope Symbol"
-msgstr "Horoskopa Simbolo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:50
-msgid "Zodiac Sign"
-msgstr "Zodiaka Signo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:51
-msgid "Blood Type"
-msgstr "Sanga Tipo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:52
-msgid "College"
-msgstr "Kolegio"
-
-#: ../libgaim/protocols/qq/buddy_info.c:53
-msgid "Email"
-msgstr "Retadreso"
-
-#: ../libgaim/protocols/qq/buddy_info.c:55
-msgid "Zipcode"
-msgstr "Poŝtkodo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:56
-msgid "Cellphone Number"
-msgstr "Poŝtelefona Numero"
-
-#: ../libgaim/protocols/qq/buddy_info.c:57
-msgid "Phone Number"
-msgstr "Telefonnumero"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aquarius"
-msgstr "Verŝisto"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Pisces"
-msgstr "Fiŝoj"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aries"
-msgstr "Ŝafo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Taurus"
-msgstr "Bovo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Gemini"
-msgstr "Ĝemeloj "
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Cancer"
-msgstr "Kankro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Leo"
-msgstr "Leono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Virgo"
-msgstr "Virgulino"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Libra"
-msgstr "Pesilo "
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Scorpio"
-msgstr "Skorpio "
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Sagittarius"
-msgstr "Pafisto"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Capricorn"
-msgstr "Kaprikorno"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Rat"
-msgstr "Rato"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Ox"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Tiger"
-msgstr "Tigro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Rabbit"
-msgstr "Kuniklo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Dragon"
-msgstr "Drako"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Snake"
-msgstr "Serpento"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Horse"
-msgstr "Ĉevalo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Goat"
-msgstr "Kapro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Monkey"
-msgstr "Simio"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Rooster"
-msgstr "Virkoko"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Dog"
-msgstr "Hundo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Pig"
-msgstr "Porko"
-
-#: ../libgaim/protocols/qq/buddy_info.c:76
-msgid "Other"
-msgstr "Alia"
-
-#: ../libgaim/protocols/qq/buddy_info.c:477
-#: ../libgaim/protocols/qq/buddy_info.c:478
-msgid "Modify my information"
-msgstr "Ŝanĝu mian informon"
-
-#: ../libgaim/protocols/qq/buddy_info.c:479
-msgid "Update my information"
-msgstr "Aktualigi mian informon"
-
-#: ../libgaim/protocols/qq/buddy_info.c:502
-msgid "Your information has been updated"
-msgstr "Via informo estas aktualigita."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:205
-#: ../libgaim/protocols/qq/group_opt.c:133
-#, c-format
-msgid "You rejected %d's request"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:206
-#: ../libgaim/protocols/qq/group_opt.c:134
-msgid "Input your reason:"
-msgstr "Enigu vian kialon:"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-msgid "Reject request"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:209
-#: ../libgaim/protocols/qq/group_opt.c:137
-msgid "Sorry, you are not my type..."
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:123
-#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
-msgid "Reject"
-msgstr "Malakceptu"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:270
-msgid "Add buddy with auth request fails"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:301
-msgid "You have successfully removed a buddy"
-msgstr "Vi sukcese forigis kunulon"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:329
-msgid "You have successfully removed yourself from a buddy"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:393
-#, c-format
-msgid "User %d needs authentication"
-msgstr "Uzanto %d bezonas aŭtentokontrolon"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:395
-#: ../libgaim/protocols/qq/group_join.c:132
-msgid "Input request here"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:396
-#: ../libgaim/protocols/qq/group_join.c:133
-msgid "Would you be my friend?"
-msgstr "Ĉu vi estus mia amiko?"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
-#: ../libgaim/protocols/qq/group_opt.c:138
-#: ../libgaim/protocols/qq/sendqueue.c:198
-msgid "Send"
-msgstr "Sendu"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:404
-#, c-format
-msgid "You have added %d in buddy list"
-msgstr "Vi aldonis %d-n en kunullisto"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:501
-msgid "QQid Error"
-msgstr "QQid Eraro"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:502
-msgid "Invalid QQid"
-msgstr "Malvalida QQid"
-
-#: ../libgaim/protocols/qq/group.c:63
-msgid "ID: "
-msgstr "ID: "
-
-#: ../libgaim/protocols/qq/group.c:96
-msgid "Group ID"
-msgstr "Grupo ID"
-
-#: ../libgaim/protocols/qq/group.c:98
-msgid "Creator"
-msgstr "Kreanto"
-
-#: ../libgaim/protocols/qq/group.c:101
-msgid "Group Description"
-msgstr "Grupo Priskribo"
-
-#: ../libgaim/protocols/qq/group.c:107
-msgid "Auth"
-msgstr "Permesi"
-
-#: ../libgaim/protocols/qq/group.c:117
-msgid "QQ Qun"
-msgstr "QQ Qun"
-
-#: ../libgaim/protocols/qq/group.c:118
-msgid "Please input external group ID"
-msgstr "B.v. enigi eksteran groupon ID-n"
-
-#: ../libgaim/protocols/qq/group.c:119
-msgid "You can only search for permanent QQ groups\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:120
-#, c-format
-msgid "User %d applied to join group %d"
-msgstr "Uzanto %d aliĝpetis grupon %d"
-
-#: ../libgaim/protocols/qq/group_im.c:121
-#: ../libgaim/protocols/qq/group_im.c:170
-#: ../libgaim/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "Reason: %s"
-msgstr "Kialo: %s"
-
-#: ../libgaim/protocols/qq/group_im.c:128
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/group_im.c:212
-#: ../libgaim/protocols/qq/group_im.c:247
-#: ../libgaim/protocols/qq/group_im.c:281
-#: ../libgaim/protocols/qq/group_join.c:227
-#: ../libgaim/protocols/qq/group_join.c:353
-#: ../libgaim/protocols/qq/group_opt.c:228
-#: ../libgaim/protocols/qq/group_opt.c:298
-#: ../libgaim/protocols/qq/group_opt.c:384
-msgid "QQ Qun Operation"
-msgstr "QQ Qun Operacio"
-
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
-msgid "Approve"
-msgstr "Aprobi"
-
-#: ../libgaim/protocols/qq/group_im.c:169
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:210
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:246
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:280
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:281
-msgid "This group has been added to your buddy list"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_internal.c:39
-msgid "I am not member"
-msgstr "Mi ne estas membro"
-
-#: ../libgaim/protocols/qq/group_internal.c:42
-msgid "I am a member"
-msgstr "Mi estas membro"
-
-#: ../libgaim/protocols/qq/group_internal.c:45
-msgid "I am applying to join"
-msgstr "Mi aliĝpetas"
-
-#: ../libgaim/protocols/qq/group_internal.c:48
-msgid "I am the admin"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_internal.c:51
-msgid "Unknown status"
-msgstr "Nekonata stato"
-
-#: ../libgaim/protocols/qq/group_join.c:78
-msgid "This group does not allow others to join"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:227
-msgid "You have successfully exited the group"
-msgstr "Vi sukcese forlasis la grupon"
-
-#: ../libgaim/protocols/qq/group_join.c:251
-msgid "QQ Group Auth"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:252
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:323
-msgid "You inputted a group id outside the acceptable range"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:354
-msgid "Are you sure to exit this Qun?"
-msgstr "Ĉu vi certas vi volas forigi tiun Qun-on?"
-
-#: ../libgaim/protocols/qq/group_join.c:356
-msgid ""
-"Note, if you are the creator, \n"
-"this operation will eventually remove this Qun."
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:359
-msgid "Go ahead"
-msgstr "Daŭrigu"
-
-#: ../libgaim/protocols/qq/group_network.c:88
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kodo [0x%02X]: %s"
-
-#: ../libgaim/protocols/qq/group_network.c:89
-msgid "Group Operation Error"
-msgstr "Grupoperacio Eraro"
-
-#: ../libgaim/protocols/qq/group_opt.c:122
-#: ../libgaim/protocols/qq/sys_msg.c:82
-msgid "Do you wanna approve the request?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:228
-msgid "You have successfully modify Qun member"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:298
-msgid "You have successfully modify Qun information"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:385
-msgid "You have successfully created a Qun"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:387
-msgid "Would you like to set up the Qun details now?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:388
-msgid "Setup"
-msgstr "Agordo"
-
-#: ../libgaim/protocols/qq/im.c:421
-msgid "System Message"
-msgstr "Sistemo Mesaĝo"
-
-#: ../libgaim/protocols/qq/im.c:565
-msgid "Server ACK"
-msgstr "Servilo ACK"
-
-#: ../libgaim/protocols/qq/im.c:565
-msgid "Send IM fail\n"
-msgstr "TM Sendo malsukcesis\n"
-
-#: ../libgaim/protocols/qq/keep_alive.c:81
-msgid "Keep alive error, seems connection lost!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/login_logout.c:404
-msgid "Request login token error!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/login_logout.c:482
-msgid "Unable to login, check debug log"
-msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2356
-#: ../libgaim/protocols/yahoo/yahoo.c:2383
-#: ../libgaim/protocols/yahoo/yahoo.c:2490
-#: ../libgaim/protocols/yahoo/yahoo.c:2511
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
-msgid "Unable to connect."
-msgstr "Ne konekteblas."
-
-#: ../libgaim/protocols/qq/qq.c:283
-msgid "QQ: Available"
-msgstr "QQ: Disponebla"
-
-#: ../libgaim/protocols/qq/qq.c:287
-msgid "QQ: Away"
-msgstr "QQ: Fora"
-
-#: ../libgaim/protocols/qq/qq.c:291
-msgid "QQ: Invisible"
-msgstr "QQ: Nevidebla"
-
-#: ../libgaim/protocols/qq/qq.c:295
-msgid "QQ: Offline"
-msgstr "QQ: Senkonekta"
-
-#: ../libgaim/protocols/qq/qq.c:372
-msgid "Invalid name"
-msgstr "Malvalida Uzantonomo"
-
-#: ../libgaim/protocols/qq/qq.c:442
-msgid "Selection"
-msgstr "Elekto"
-
-#: ../libgaim/protocols/qq/qq.c:445
-msgid "Select a number"
-msgstr "Elektu nombron"
-
-#: ../libgaim/protocols/qq/qq.c:451
-msgid "Faces"
-msgstr "Vizaĝoj"
-
-#: ../libgaim/protocols/qq/qq.c:456
-msgid "Change Your QQ Face"
-msgstr "Ŝanĝu vian QQ Vizaĝon"
-
-#: ../libgaim/protocols/qq/qq.c:457
-msgid "Change Face"
-msgstr "Ŝanĝu Vizaĝon"
-
-#: ../libgaim/protocols/qq/qq.c:458
-msgid "Update"
-msgstr "Aktualigu"
-
-#: ../libgaim/protocols/qq/qq.c:512
-#, c-format
-msgid "<b>Current Online</b>: %d<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:513
-#, c-format
-msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:517
-#, c-format
-msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:518
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:519
-#, c-format
-msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:522
-msgid "<i>Information below may not be accurate</i><br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:524
-#, c-format
-msgid "<b>Login Time</b>: %s<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:525
-#, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:526
-#, c-format
-msgid "<b>Last Login Time</b>: %s\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:530
-msgid "Login Information"
-msgstr "Ensaluta Informo"
-
-#: ../libgaim/protocols/qq/qq.c:802
-msgid "Modify My Information"
-msgstr "Ŝanĝu Mian Informon"
-
-#: ../libgaim/protocols/qq/qq.c:805
-msgid "Change My Face"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
-msgid "Change Password"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:811
-msgid "Show Login Information"
-msgstr "Montru Ensalutan Informon"
-
-#: ../libgaim/protocols/qq/qq.c:837
-msgid "Exit this QQ Qun"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "This function has not be implemented yet"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "Please wait for new version"
-msgstr "B.v. atendi novan version"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protokolo\tKromaĵo"
 
-#: ../libgaim/protocols/qq/qq.c:1025
+#: ../libgaim/protocols/qq/qq.c:752
 msgid "Login in TCP"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:1028
+#: ../libgaim/protocols/qq/qq.c:755
 msgid "Login Hidden"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:493
+#: ../libgaim/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:496
+#: ../libgaim/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Konekto malakceptita"
 
-#: ../libgaim/protocols/qq/recv_core.c:304
+#: ../libgaim/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/recv_core.c:314
+#: ../libgaim/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr ""
 
@@ -11413,76 +11674,60 @@
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sendqueue.c:167
-msgid "Connection lost!"
-msgstr ""
-
-#. cancel logging progress
-#: ../libgaim/protocols/qq/sendqueue.c:174
-msgid "Login failed, no reply!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-msgid "Connection timeout!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-msgid "User info is not updated"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sendqueue.c:194
-msgid "Send packet"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sendqueue.c:196
-msgid "Packets lost, send again?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sys_msg.c:101
+#: ../libgaim/protocols/qq/sendqueue.c:122
+msgid "Connection lost"
+msgstr "Konekto perdita"
+
+#. cancel login progress
+#: ../libgaim/protocols/qq/sendqueue.c:130
+msgid "Login failed, no reply"
+msgstr ""
+
+#: ../libgaim/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr "Ĉu vi volas aldoni tiun kunul?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:153
+#: ../libgaim/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:156
+#: ../libgaim/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:177
+#: ../libgaim/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:197
+#: ../libgaim/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:220
+#: ../libgaim/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:221
+#: ../libgaim/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaĝo: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:242
+#: ../libgaim/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libgaim/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
@@ -11517,144 +11762,141 @@
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1498
+#: ../libgaim/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1503
+#: ../libgaim/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1508
+#: ../libgaim/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1513
+#: ../libgaim/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1518
-msgid "Login Redirected"
-msgstr ""
-
 #: ../libgaim/protocols/sametime/sametime.c:1524
+msgid "Login Redirected"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1528
+#: ../libgaim/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1533
+#: ../libgaim/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1538
+#: ../libgaim/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1636
+#: ../libgaim/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1641
+#: ../libgaim/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1693
+#: ../libgaim/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1700
+#: ../libgaim/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1723
-#: ../libgaim/protocols/sametime/sametime.c:3734
+#: ../libgaim/protocols/sametime/sametime.c:1732
+#: ../libgaim/protocols/sametime/sametime.c:3745
 msgid "Unable to connect to host"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1761
+#: ../libgaim/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1935
+#: ../libgaim/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2392
+#: ../libgaim/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2949
+#: ../libgaim/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3240
+#: ../libgaim/protocols/sametime/sametime.c:3251
 msgid "Microphone"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3241
+#: ../libgaim/protocols/sametime/sametime.c:3252
 msgid "Speakers"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3242
+#: ../libgaim/protocols/sametime/sametime.c:3253
 msgid "Video Camera"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3246
+#: ../libgaim/protocols/sametime/sametime.c:3257
 msgid "File Transfer"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3280
-#, c-format
-msgid ""
-"\n"
-"<b>Supports:</b> %s"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:3285
-msgid ""
-"\n"
-"<b>External User</b>"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:3391
+#: ../libgaim/protocols/sametime/sametime.c:3291
+#: ../libgaim/protocols/sametime/sametime.c:4165
+msgid "Supports"
+msgstr "Subtenas"
+
+#: ../libgaim/protocols/sametime/sametime.c:3296
+#: ../libgaim/protocols/sametime/sametime.c:4139
+msgid "External User"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:3402
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3392
+#: ../libgaim/protocols/sametime/sametime.c:3403
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/sametime/sametime.c:3407
 msgid "New Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3398
+#: ../libgaim/protocols/sametime/sametime.c:3409
 msgid "Create"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3462
+#: ../libgaim/protocols/sametime/sametime.c:3473
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3468
+#: ../libgaim/protocols/sametime/sametime.c:3479
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3475
+#: ../libgaim/protocols/sametime/sametime.c:3486
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3476
+#: ../libgaim/protocols/sametime/sametime.c:3487
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11662,174 +11904,150 @@
 "this user to."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3481
+#: ../libgaim/protocols/sametime/sametime.c:3492
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3571
+#: ../libgaim/protocols/sametime/sametime.c:3582
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3576
+#: ../libgaim/protocols/sametime/sametime.c:3587
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3623
+#: ../libgaim/protocols/sametime/sametime.c:3634
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3645
+#: ../libgaim/protocols/sametime/sametime.c:3656
 #, 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3650
+#: ../libgaim/protocols/sametime/sametime.c:3661
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3651
+#: ../libgaim/protocols/sametime/sametime.c:3662
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4129
-msgid "<b>External User</b><br>"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4132
-#, c-format
-msgid "<b>User ID:</b> %s<br>"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4138
-#, c-format
-msgid "<b>Full Name:</b> %s<br>"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4144
-msgid "<b>Last Known Client:</b> "
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4152
+#: ../libgaim/protocols/sametime/sametime.c:4155
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4159
-#, c-format
-msgid "<b>Supports:</b> %s<br>"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4165
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:4317
-#: ../libgaim/protocols/sametime/sametime.c:5509
+#: ../libgaim/protocols/sametime/sametime.c:4157
+msgid "Last Known Client"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:4321
+#: ../libgaim/protocols/sametime/sametime.c:5516
 msgid "User Name"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4320
-#: ../libgaim/protocols/sametime/sametime.c:5512
+#: ../libgaim/protocols/sametime/sametime.c:4324
+#: ../libgaim/protocols/sametime/sametime.c:5519
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4344
+#: ../libgaim/protocols/sametime/sametime.c:4348
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4345
+#: ../libgaim/protocols/sametime/sametime.c:4349
 #, 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4350
+#: ../libgaim/protocols/sametime/sametime.c:4354
 msgid "Select User"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4434
+#: ../libgaim/protocols/sametime/sametime.c:4438
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4436
+#: ../libgaim/protocols/sametime/sametime.c:4440
 #, 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4441
+#: ../libgaim/protocols/sametime/sametime.c:4445
 msgid "Unable to add user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5027
+#: ../libgaim/protocols/sametime/sametime.c:5031
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5159
+#: ../libgaim/protocols/sametime/sametime.c:5166
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5164
-msgid "Buddy List Storage Mode"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:5167
-msgid "Local Buddy List Only"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:5169
-msgid "Merge List from Server"
-msgstr ""
-
 #: ../libgaim/protocols/sametime/sametime.c:5171
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:5174
+msgid "Local Buddy List Only"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:5176
+msgid "Merge List from Server"
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:5178
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5173
+#: ../libgaim/protocols/sametime/sametime.c:5180
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5222
+#: ../libgaim/protocols/sametime/sametime.c:5229
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5261
+#: ../libgaim/protocols/sametime/sametime.c:5268
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5314
+#: ../libgaim/protocols/sametime/sametime.c:5321
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5315
+#: ../libgaim/protocols/sametime/sametime.c:5322
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5318
-#: ../libgaim/protocols/sametime/sametime.c:5447
+#: ../libgaim/protocols/sametime/sametime.c:5325
+#: ../libgaim/protocols/sametime/sametime.c:5454
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5377
+#: ../libgaim/protocols/sametime/sametime.c:5384
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5393
+#: ../libgaim/protocols/sametime/sametime.c:5400
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5401
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11837,37 +12055,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5406
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5441
+#: ../libgaim/protocols/sametime/sametime.c:5448
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5450
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5484
+#: ../libgaim/protocols/sametime/sametime.c:5491
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5485
+#: ../libgaim/protocols/sametime/sametime.c:5492
 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/sametime/sametime.c:5540
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5534
+#: ../libgaim/protocols/sametime/sametime.c:5541
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11875,55 +12093,55 @@
 "buttons below."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5566
+#: ../libgaim/protocols/sametime/sametime.c:5573
 msgid "No matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5567
+#: ../libgaim/protocols/sametime/sametime.c:5574
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5571
+#: ../libgaim/protocols/sametime/sametime.c:5578
 msgid "No Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5608
+#: ../libgaim/protocols/sametime/sametime.c:5615
 msgid "Search for a user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5609
+#: ../libgaim/protocols/sametime/sametime.c:5616
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5612
+#: ../libgaim/protocols/sametime/sametime.c:5619
 msgid "User Search"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5624
+#: ../libgaim/protocols/sametime/sametime.c:5631
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5628
+#: ../libgaim/protocols/sametime/sametime.c:5635
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5632
+#: ../libgaim/protocols/sametime/sametime.c:5639
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5636
+#: ../libgaim/protocols/sametime/sametime.c:5643
 msgid "User Search..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5733
+#: ../libgaim/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5743
+#: ../libgaim/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr ""
 
@@ -12007,12 +12225,12 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
-#: ../libgaim/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
+#: ../libgaim/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr ""
 
@@ -12158,32 +12376,32 @@
 msgid "Anxious"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Uzanto Modusoj"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Etoso"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferata Kontakto"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferata Lingvo"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
 #: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Temporegiono"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
@@ -12203,7 +12421,7 @@
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
@@ -12313,7 +12531,7 @@
 msgid "Group Name"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
 #: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr ""
@@ -12540,19 +12758,19 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
@@ -12560,55 +12778,55 @@
 msgid "_More..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
+#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
+#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1518
+#: ../libgaim/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
+#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1548
+#: ../libgaim/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1579
+#: ../libgaim/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12628,96 +12846,96 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1602
+#: ../libgaim/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
+#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1610
+#: ../libgaim/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1615
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1707
+#: ../libgaim/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1712
+#: ../libgaim/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1721
+#: ../libgaim/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1756
+#: ../libgaim/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
 #: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1820
+#: ../libgaim/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Aŭtentokontrolas konekton"
 
-#: ../libgaim/protocols/silc/ops.c:1867
+#: ../libgaim/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1908
+#: ../libgaim/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1937
+#: ../libgaim/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1940
+#: ../libgaim/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1943
+#: ../libgaim/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1946
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1949
+#: ../libgaim/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1952
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-
 #: ../libgaim/protocols/silc/ops.c:1957
-msgid "Failure: Incorrect signature"
+msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
 #: ../libgaim/protocols/silc/ops.c:1959
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: ../libgaim/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1970
+#: ../libgaim/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr ""
 
@@ -12970,7 +13188,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
@@ -13075,60 +13293,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1819
+#: ../libgaim/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protokol-Kromaĵo"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1821
+#: ../libgaim/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1858
+#: ../libgaim/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1862
+#: ../libgaim/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1872
+#: ../libgaim/protocols/silc/silc.c:1873
 msgid "Cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1882
+#: ../libgaim/protocols/silc/silc.c:1883
 msgid "HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1885
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1891
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Block invites"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1894
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1897
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1900
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1903
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1906
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
@@ -13260,8 +13478,8 @@
 msgstr ""
 
 #: ../libgaim/protocols/simple/simple.c:1647
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr ""
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "SIP ekrannomoj ne enhaveblas blankan spacon aŭ @ simbolon"
 
 #. *< type
 #. *< ui_requirement
@@ -13271,36 +13489,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1815
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libgaim/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "La SIP/SIMPLE Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/simple/simple.c:1838
+#: ../libgaim/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1844
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "Uzu UDP-n"
 
-#: ../libgaim/protocols/simple/simple.c:1846
+#: ../libgaim/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Uzu Prokurilon"
 
-#: ../libgaim/protocols/simple/simple.c:1848
+#: ../libgaim/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../libgaim/protocols/simple/simple.c:1850
+#: ../libgaim/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1852
+#: ../libgaim/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr ""
 
@@ -13410,8 +13628,8 @@
 msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:549
-msgid "Incorrect nickname or password."
-msgstr "Misa karesnomo aŭ pasvorto."
+msgid "Incorrect screen name or password."
+msgstr "Misa ekrannomo aŭ pasvorto."
 
 #: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
@@ -13533,7 +13751,7 @@
 msgstr "Via Yahoo!-a mesaĝo malsendiĝas."
 
 #: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3738
+#: ../libgaim/protocols/yahoo/yahoo.c:3732
 msgid "Buzz!!"
 msgstr "Zum!!"
 
@@ -13542,35 +13760,27 @@
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistem-mesaĝo pro %s:"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: ../libgaim/protocols/yahoo/yahoo.c:994
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "La uzanto %s volas aldoni %s al sia kunullisto%s%s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1000
-msgid "Message (optional) :"
-msgstr "Mesaĝo (fakultativa) :"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1042
+#: ../libgaim/protocols/yahoo/yahoo.c:958
+msgid "Authorization denied message:"
+msgstr "Rifuzita permeso mesaĝo:"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1037
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1045
+#: ../libgaim/protocols/yahoo/yahoo.c:1040
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1048
+#: ../libgaim/protocols/yahoo/yahoo.c:1043
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1799
+#: ../libgaim/protocols/yahoo/yahoo.c:1794
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13578,30 +13788,26 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1802
+#: ../libgaim/protocols/yahoo/yahoo.c:1797
 msgid "Failed Yahoo! Authentication"
 msgstr "Malsukcesis Yahoo! Aŭtentokontrolo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1868
+#: ../libgaim/protocols/yahoo/yahoo.c:1863
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1871
+#: ../libgaim/protocols/yahoo/yahoo.c:1866
 msgid "Ignore buddy?"
 msgstr "Ignoru Kunulon?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1905
-msgid "Invalid username."
-msgstr "Malvalida uzantonomo."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1919
+#: ../libgaim/protocols/yahoo/yahoo.c:1914
 msgid "Normal authentication failed!"
 msgstr "Normala aŭtentokontrolo malsukcesis!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1920
+#: ../libgaim/protocols/yahoo/yahoo.c:1915
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -13609,140 +13815,140 @@
 "reduced functionality and features."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1931
+#: ../libgaim/protocols/yahoo/yahoo.c:1926
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1934
+#: ../libgaim/protocols/yahoo/yahoo.c:1929
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1988
+#: ../libgaim/protocols/yahoo/yahoo.c:1983
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1991
+#: ../libgaim/protocols/yahoo/yahoo.c:1986
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2110
+#: ../libgaim/protocols/yahoo/yahoo.c:2105
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2441
+#: ../libgaim/protocols/yahoo/yahoo.c:2436
 msgid "Received unexpected HTTP response from server."
 msgstr "Ricevis neatendita HTTP respondo de servilo."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2465
-#: ../libgaim/protocols/yahoo/yahoo.c:2637
-#: ../libgaim/protocols/yahoo/yahoo.c:2740
-#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoo.c:2460
+#: ../libgaim/protocols/yahoo/yahoo.c:2632
+#: ../libgaim/protocols/yahoo/yahoo.c:2735
+#: ../libgaim/protocols/yahoo/yahoo.c:2745
 #: ../libgaim/protocols/yahoo/yahoochat.c:1455
 #: ../libgaim/protocols/yahoo/yahoochat.c:1525
 #: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Konektado problemo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2865
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libgaim/protocols/yahoo/yahoo.c:2860
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Not at Home"
 msgstr "Malhejme"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2867
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libgaim/protocols/yahoo/yahoo.c:2862
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Not at Desk"
 msgstr "Malpupitre"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2869
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libgaim/protocols/yahoo/yahoo.c:2864
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not in Office"
 msgstr "Malofice"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libgaim/protocols/yahoo/yahoo.c:2868
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "On Vacation"
 msgstr "Feriante"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2877
-#: ../libgaim/protocols/yahoo/yahoo.c:3490
+#: ../libgaim/protocols/yahoo/yahoo.c:2872
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "Stepped Out"
 msgstr "Ekeliris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2970
-#: ../libgaim/protocols/yahoo/yahoo.c:3000
+#: ../libgaim/protocols/yahoo/yahoo.c:2965
+#: ../libgaim/protocols/yahoo/yahoo.c:2995
 msgid "Not on server list"
 msgstr "Ne en servilo listo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3017
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libgaim/protocols/yahoo/yahoo.c:3012
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
 msgid "Appear Online"
 msgstr "Aperas Enreta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3020
-#: ../libgaim/protocols/yahoo/yahoo.c:3097
+#: ../libgaim/protocols/yahoo/yahoo.c:3015
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Appear Permanently Offline"
 msgstr "Aperas Ĉiama Senkonekta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3039
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
 msgid "Presence"
 msgstr "Ĉeesto"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3082
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Offline"
 msgstr "Aperas Senkonekta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libgaim/protocols/yahoo/yahoo.c:3085
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne Aperas Ĉiama Senkonekta"
 
+#: ../libgaim/protocols/yahoo/yahoo.c:3133
+msgid "Join in Chat"
+msgstr "Aliĝu Babilejon"
+
 #: ../libgaim/protocols/yahoo/yahoo.c:3139
-msgid "Join in Chat"
-msgstr "Aliĝu Babilejon"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Iniciati Konferencon"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libgaim/protocols/yahoo/yahoo.c:3167
 msgid "Presence Settings"
 msgstr "Ĉeesto Agordoj"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3179
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3211
+#: ../libgaim/protocols/yahoo/yahoo.c:3205
 msgid "Active which ID?"
 msgstr "Ŝaltu kiun ID?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3220
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
 msgid "Join who in chat?"
 msgstr "Kiun kuniĝi en babilejo?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3230
+#: ../libgaim/protocols/yahoo/yahoo.c:3224
 msgid "Activate ID..."
 msgstr "Ŝaltu ID-on..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3234
+#: ../libgaim/protocols/yahoo/yahoo.c:3228
 msgid "Join User in Chat..."
 msgstr "Kuniĝu Uzanto en Babilejo..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3797
+#: ../libgaim/protocols/yahoo/yahoo.c:3791
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3796
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3806
+#: ../libgaim/protocols/yahoo/yahoo.c:3800
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3810
+#: ../libgaim/protocols/yahoo/yahoo.c:3804
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13756,56 +13962,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3904
-#: ../libgaim/protocols/yahoo/yahoo.c:3906
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
+#: ../libgaim/protocols/yahoo/yahoo.c:3901
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3923
+#: ../libgaim/protocols/yahoo/yahoo.c:3918
 msgid "Yahoo Japan"
 msgstr "Yahoo Japanio"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3926
+#: ../libgaim/protocols/yahoo/yahoo.c:3921
 msgid "Pager server"
 msgstr "Paĝila servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3929
+#: ../libgaim/protocols/yahoo/yahoo.c:3924
 msgid "Japan Pager server"
 msgstr "Japana Paĝila servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3932
+#: ../libgaim/protocols/yahoo/yahoo.c:3927
 msgid "Pager port"
 msgstr "Paĝila pordo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3935
+#: ../libgaim/protocols/yahoo/yahoo.c:3930
 msgid "File transfer server"
 msgstr "Dosieralŝuto servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3938
+#: ../libgaim/protocols/yahoo/yahoo.c:3933
 msgid "Japan file transfer server"
 msgstr "Japana dosieralŝuto servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3941
+#: ../libgaim/protocols/yahoo/yahoo.c:3936
 msgid "File transfer port"
 msgstr "Dosieralŝuto pordo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3944
+#: ../libgaim/protocols/yahoo/yahoo.c:3939
 msgid "Chat room locale"
 msgstr "Babilejo lokaĵaro"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3947
+#: ../libgaim/protocols/yahoo/yahoo.c:3942
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3955
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
 msgid "Chat room list URL"
 msgstr "Babilejolisto URL"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3958
+#: ../libgaim/protocols/yahoo/yahoo.c:3953
 msgid "Yahoo Chat server"
 msgstr "Yahoo Babil servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3961
+#: ../libgaim/protocols/yahoo/yahoo.c:3956
 msgid "Yahoo Chat port"
 msgstr "Yahoo Babilo pordo"
 
@@ -13896,91 +14102,86 @@
 msgid "Write Error"
 msgstr "Skriberaro"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP Adreso:</b> %s<br>"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japana profilo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profilo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
+"web browser:"
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Hobioj"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Lastaj Novaĵoj"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Lasta Aktualigo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Uzanto informo pri %s nedisponebla"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "La uzanto profilo malplenas."
 
@@ -14008,100 +14209,99 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:786
-#: ../libgaim/protocols/zephyr/zephyr.c:1203
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>Uzanto:</b> %s<br>"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:790
-#: ../libgaim/protocols/zephyr/zephyr.c:1208
-msgid "<br>Hidden or not logged-in"
-msgstr "<br>Kaŝita aŭ ne ensalutita."
-
-#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:787
+#: ../libgaim/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Uzanto"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:792
 #: ../libgaim/protocols/zephyr/zephyr.c:1210
+msgid "Hidden or not logged-in"
+msgstr "Kaŝita aŭ ne ensalutita"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:798
+#: ../libgaim/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ĉe %s ek de %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1542
-#: ../libgaim/protocols/zephyr/zephyr.c:1543
+#: ../libgaim/protocols/zephyr/zephyr.c:1546
+#: ../libgaim/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Iu ajn"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2350
+#: ../libgaim/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klaso:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2356
+#: ../libgaim/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Apero:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2362
+#: ../libgaim/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Ricevanto:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2373
+#: ../libgaim/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2686
+#: ../libgaim/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2691
+#: ../libgaim/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2696
+#: ../libgaim/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2701
+#: ../libgaim/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2706
+#: ../libgaim/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2712
+#: ../libgaim/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2717
+#: ../libgaim/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2723
+#: ../libgaim/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2729
+#: ../libgaim/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2735
+#: ../libgaim/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2740
+#: ../libgaim/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2846
+#: ../libgaim/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Realiĝu"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2849
+#: ../libgaim/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -14115,40 +14315,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2935
-#: ../libgaim/protocols/zephyr/zephyr.c:2937
+#: ../libgaim/protocols/zephyr/zephyr.c:2940
+#: ../libgaim/protocols/zephyr/zephyr.c:2942
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2956
+#: ../libgaim/protocols/zephyr/zephyr.c:2961
 msgid "Use tzc"
 msgstr "Uzu tzc-n"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2959
+#: ../libgaim/protocols/zephyr/zephyr.c:2964
 msgid "tzc command"
 msgstr "tzc komando"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2962
+#: ../libgaim/protocols/zephyr/zephyr.c:2967
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2965
+#: ../libgaim/protocols/zephyr/zephyr.c:2970
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2968
+#: ../libgaim/protocols/zephyr/zephyr.c:2973
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2971
+#: ../libgaim/protocols/zephyr/zephyr.c:2976
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2974
+#: ../libgaim/protocols/zephyr/zephyr.c:2979
 msgid "Realm"
 msgstr "Sfero"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2977
+#: ../libgaim/protocols/zephyr/zephyr.c:2982
 msgid "Exposure"
 msgstr "Montreco"
 
@@ -14186,9 +14386,20 @@
 msgstr ""
 
 #. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libgaim/request.h:1341
+msgid "_Yes"
+msgstr "_Jes"
+
+#: ../libgaim/request.h:1341
+msgid "_No"
+msgstr "_Ne"
+
+#. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1354
+#: ../libgaim/request.h:1360
 msgid "_Accept"
 msgstr "_Akceptu"
 
@@ -14208,7 +14419,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s nun estas konata kiel %s.\n"
 
-#: ../libgaim/server.c:686
+#: ../libgaim/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14217,12 +14428,12 @@
 "%s invitis %s al babilejo %s:\n"
 "%s"
 
-#: ../libgaim/server.c:691
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s invitis %s al babilejo %s\n"
 
-#: ../libgaim/server.c:695
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
 msgstr "Ĉu akceptu babilinviton ?"
 
@@ -14278,91 +14489,91 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2429
+#: ../libgaim/util.c:2434
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eraro dum legado %s"
 
-#: ../libgaim/util.c:2430
+#: ../libgaim/util.c:2435
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../libgaim/util.c:2893
+#: ../libgaim/util.c:2898
 msgid "Calculating..."
 msgstr "Kalkulante..."
 
-#: ../libgaim/util.c:2896
+#: ../libgaim/util.c:2901
 msgid "Unknown."
 msgstr "Nekonata."
 
-#: ../libgaim/util.c:2922
+#: ../libgaim/util.c:2927
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
-#: ../libgaim/util.c:2934
+#: ../libgaim/util.c:2939
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d tago"
 msgstr[1] "%d tagoj"
 
-#: ../libgaim/util.c:2942
+#: ../libgaim/util.c:2947
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d horo"
 msgstr[1] "%s, %d horoj"
 
-#: ../libgaim/util.c:2948
+#: ../libgaim/util.c:2953
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
-#: ../libgaim/util.c:2956
+#: ../libgaim/util.c:2961
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutoj"
 
-#: ../libgaim/util.c:2962
+#: ../libgaim/util.c:2967
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutoj"
 
-#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ne konekteblas al %s"
 
-#: ../libgaim/util.c:3287
+#: ../libgaim/util.c:3292
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libgaim/util.c:3324
+#: ../libgaim/util.c:3327
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eraro legante de %s: %s"
 
-#: ../libgaim/util.c:3355
+#: ../libgaim/util.c:3358
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eraro skribante al %s: %s"
 
-#: ../libgaim/util.c:3380
+#: ../libgaim/util.c:3383
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ne konekteblas al %s: %s"