changeset 22945:32ab66380789

Updated British English translation. Thanks Luke Ross! Fixes #5787
author Mark Doliner <mark@kingant.net>
date Thu, 15 May 2008 10:27:28 +0000
parents e2c58ab11eb9
children cd75e4bc2acb
files po/ChangeLog po/en_GB.po
diffstat 2 files changed, 1283 insertions(+), 5741 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu May 15 10:23:25 2008 +0000
+++ b/po/ChangeLog	Thu May 15 10:27:28 2008 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.4.2
+	* English (British) translation updated (Luke Ross)
 	* Finnish translation updated (Timo Jyrinki)
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
--- a/po/en_GB.po	Thu May 15 10:23:25 2008 +0000
+++ b/po/en_GB.po	Thu May 15 10:27:28 2008 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
+"POT-Creation-Date: 2008-05-13 22:29+0100\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -16,17 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Try `%s -h' for more information.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -47,7 +45,6 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -58,510 +55,100 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Account was not added"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr "Screen name of an account must not be empty."
-
-#: ../finch/gntaccount.c:437
+msgid "Username of an account must be non-empty."
+msgstr "Username of an account must be non-empty."
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Remember password"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "There are no protocol plugins installed."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(You probably forgot to 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Modify Account"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "New Account"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
-msgstr "Screen name:"
-
-#: ../finch/gntaccount.c:542
+msgid "Username:"
+msgstr "Username:"
+
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Save"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Delete Account"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "Delete"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "You can enable/disable accounts from the following list."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Add"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Modify"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Authorise buddy?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Authorise"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Deny"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
-msgstr "You must provide a screen name for the buddy."
-
-#: ../finch/gntblist.c:291
-msgid "You must provide a group."
-msgstr "You must provide a group."
-
-#: ../finch/gntblist.c:293
-msgid "You must select an account."
-msgstr "You must select an account."
-
-#: ../finch/gntblist.c:295
-msgid "The selected account is not online."
-msgstr "The selected account is not online."
-
-#: ../finch/gntblist.c:300
-msgid "Error adding buddy"
-msgstr "Error adding buddy"
-
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
-msgid "Screen Name"
-msgstr "Screen Name"
-
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
-msgid "Alias"
-msgstr "Alias"
-
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Group"
-
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
-msgid "Account"
-msgstr "Account"
-
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
-msgid "Add Buddy"
-msgstr "Add Buddy"
-
-#: ../finch/gntblist.c:341
-msgid "Please enter buddy information."
-msgstr "Please enter buddy information."
-
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
-msgid "Chats"
-msgstr "Chats"
-
-#. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
-msgid "Name"
-msgstr "Name"
-
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
-msgid "Auto-join"
-msgstr "Auto-join"
-
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
-msgid "Add Chat"
-msgstr "Add Chat"
-
-#: ../finch/gntblist.c:420
-msgid "You can edit more information from the context menu later."
-msgstr "You can edit more information from the context menu later."
-
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
-msgid "Error adding group"
-msgstr "Error adding group"
-
-#: ../finch/gntblist.c:434
-msgid "You must give a name for the group to add."
-msgstr "You must give a name for the group to add."
-
-#: ../finch/gntblist.c:447
-msgid "A group with the name already exists."
-msgstr "A group with that name already exists."
-
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
-msgid "Add Group"
-msgstr "Add Group"
-
-#: ../finch/gntblist.c:454
-msgid "Enter the name of the group"
-msgstr "Enter the name of the group"
-
-#: ../finch/gntblist.c:802
-msgid "Edit Chat"
-msgstr "Edit Chat"
-
-#: ../finch/gntblist.c:802
-msgid "Please Update the necessary fields."
-msgstr "Please update the necessary fields."
-
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
-msgid "Edit"
-msgstr "Edit"
-
-#: ../finch/gntblist.c:828
-msgid "Edit Settings"
-msgstr "Edit Settings"
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-msgid "Information"
-msgstr "Information"
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-msgid "Retrieving..."
-msgstr "Retrieving..."
-
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
-msgid "Get Info"
-msgstr "Get Info"
-
-#: ../finch/gntblist.c:908
-msgid "Add Buddy Pounce"
-msgstr "Add Buddy Pounce"
-
-#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
-msgid "Send File"
-msgstr "Send File"
-
-#: ../finch/gntblist.c:919
-msgid "View Log"
-msgstr "View Log"
-
-#: ../finch/gntblist.c:1000
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "Please enter the new name for %s"
-
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
-msgid "Rename"
-msgstr "Rename"
-
-#: ../finch/gntblist.c:1002
-msgid "Set Alias"
-msgstr "Set Alias"
-
-#: ../finch/gntblist.c:1003
-msgid "Enter empty string to reset the name."
-msgstr "Enter empty string to reset the name."
-
-#: ../finch/gntblist.c:1079
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Removing this contact will also remove all the buddies in the contact"
-
-#: ../finch/gntblist.c:1087
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Removing this group will also remove all the buddies in the group"
-
-#: ../finch/gntblist.c:1092
-#, c-format
-msgid "Are you sure you want to remove %s?"
-msgstr "Are you sure you want to remove %s?"
-
-#. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
-msgid "Confirm Remove"
-msgstr "Confirm Remove"
-
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
-msgid "Remove"
-msgstr "Remove"
-
-#. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
-msgid "Buddy List"
-msgstr "Buddy List"
-
-#: ../finch/gntblist.c:1257
-msgid "Place tagged"
-msgstr "Place tagged"
-
-#: ../finch/gntblist.c:1262
-msgid "Toggle Tag"
-msgstr "Toggle Tag"
-
-#. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
-msgid "Nickname"
-msgstr "Nickname"
-
-#. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
-msgid "Idle"
-msgstr "Idle"
-
-#: ../finch/gntblist.c:1334
-msgid "On Mobile"
-msgstr "On Mobile"
-
-#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -570,12 +157,10 @@
 "Online: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -584,122 +169,275 @@
 "\n"
 "Last Seen: %s ago"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+msgid "Default"
+msgstr "Default"
+
+msgid "You must provide a username for the buddy."
+msgstr "You must provide a username for the buddy."
+
+msgid "You must provide a group."
+msgstr "You must provide a group."
+
+msgid "You must select an account."
+msgstr "You must select an account."
+
+msgid "The selected account is not online."
+msgstr "The selected account is not online."
+
+msgid "Error adding buddy"
+msgstr "Error adding buddy"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Alias (optional)"
+msgstr "Alias (optional)"
+
+msgid "Add in group"
+msgstr "Add in group"
+
+msgid "Account"
+msgstr "Account"
+
+msgid "Add Buddy"
+msgstr "Add Buddy"
+
+msgid "Please enter buddy information."
+msgstr "Please enter buddy information."
+
+msgid "Chats"
+msgstr "Chats"
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr "Name"
+
+msgid "Alias"
+msgstr "Alias"
+
+msgid "Group"
+msgstr "Group"
+
+msgid "Auto-join"
+msgstr "Auto-join"
+
+msgid "Add Chat"
+msgstr "Add Chat"
+
+msgid "You can edit more information from the context menu later."
+msgstr "You can edit more information from the context menu later."
+
+msgid "Error adding group"
+msgstr "Error adding group"
+
+msgid "You must give a name for the group to add."
+msgstr "You must give a name for the group to add."
+
+msgid "A group with the name already exists."
+msgstr "A group with that name already exists."
+
+msgid "Add Group"
+msgstr "Add Group"
+
+msgid "Enter the name of the group"
+msgstr "Enter the name of the group"
+
+msgid "Edit Chat"
+msgstr "Edit Chat"
+
+msgid "Please Update the necessary fields."
+msgstr "Please update the necessary fields."
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Edit Settings"
+msgstr "Edit Settings"
+
+msgid "Information"
+msgstr "Information"
+
+msgid "Retrieving..."
+msgstr "Retrieving..."
+
+msgid "Get Info"
+msgstr "Get Info"
+
+msgid "Add Buddy Pounce"
+msgstr "Add Buddy Pounce"
+
+#. if (q_bud && is_online(q_bud->status)) {
+msgid "Send File"
+msgstr "Send File"
+
+msgid "Blocked"
+msgstr "Blocked"
+
+msgid "View Log"
+msgstr "View Log"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Please enter the new name for %s"
+
+msgid "Rename"
+msgstr "Rename"
+
+msgid "Set Alias"
+msgstr "Set Alias"
+
+msgid "Enter empty string to reset the name."
+msgstr "Enter empty string to reset the name."
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Removing this contact will also remove all the buddies in the contact"
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Removing this group will also remove all the buddies in the group"
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Are you sure you want to remove %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr "Confirm Remove"
+
+msgid "Remove"
+msgstr "Remove"
+
+#. Buddy List
+msgid "Buddy List"
+msgstr "Buddy List"
+
+msgid "Place tagged"
+msgstr "Place tagged"
+
+msgid "Toggle Tag"
+msgstr "Toggle Tag"
+
+#. General
+msgid "Nickname"
+msgstr "Nickname"
+
+#. Idle stuff
+msgid "Idle"
+msgstr "Idle"
+
+msgid "On Mobile"
+msgstr "On Mobile"
+
 msgid "New..."
 msgstr "New..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Saved..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Name"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Account"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
-msgid "New Instant Message"
-msgstr "New Instant Message"
-
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Please enter the screen name or alias of the person you would like to IM."
+msgid "Block/Unblock"
+msgstr "Block/Unblock"
+
+msgid "Block"
+msgstr "Block"
+
+msgid "Unblock"
+msgstr "Unblock"
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+msgid "New Instant Message"
+msgstr "New Instant Message"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr "Please enter the username or alias of the person you would like to IM."
+
+msgid "Channel"
+msgstr "Channel:"
+
+msgid "Join a Chat"
+msgstr "Join a Chat"
+
+msgid "Please enter the name of the chat you want to join."
+msgstr "Please enter the name of the chat you want to join."
+
+msgid "Join"
+msgstr "Join"
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "Send IM..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Show empty groups"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Show Offline Buddies"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Sort by status"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Sort alphabetically"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Sort by log size"
-
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Block/Unblock..."
+msgstr "Block/Unblock..."
+
+msgid "Join Chat..."
+msgstr "Join Chat..."
+
+msgid "View Log..."
+msgstr "View Log..."
+
+msgid "Show"
+msgstr "Show"
+
+msgid "Empty groups"
+msgstr "Empty groups"
+
+msgid "Offline buddies"
+msgstr "Offline buddies"
+
+msgid "Sort"
+msgstr "Sort"
+
+msgid "By Status"
+msgstr "By Status"
+
+msgid "Alphabetically"
+msgstr "Alphabetically"
+
+msgid "By Log Size"
+msgstr "By Log Size"
+
+msgid "Buddy"
+msgstr "Buddy"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Grouping"
+msgstr "Grouping"
+
 msgid "Certificate Import"
 msgstr "Certificate Import"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Specify a hostname"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Type the host name this certificate is for."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -708,19 +446,15 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Certificate Import Error"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509 certificate import failed"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Select a PEM certificate"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -729,24 +463,19 @@
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Certificate Export Error"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509 certificate export failed"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 Certificate Export"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificate for %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -759,56 +488,38 @@
 "SHA1 fingerprint:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "SSL Host Certificate"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Really delete certificate for %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Confirm certificate delete"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
 msgstr "Certificate Manager"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Hostname"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Close"
 
-#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s disconnected."
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -821,50 +532,46 @@
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "Re-enable Account"
 
-#: ../finch/gntconv.c:139
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"The account has disconnected and you are no longer in this chat. You will "
+"automatically rejoin the chat when the account reconnects."
+
 msgid "No such command."
 msgstr "No such command."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "That command only works in chats, not IMs."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not chats."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: ../finch/gntconv.c:168
 msgid "Message was not sent, because you are not signed on."
 msgstr "Message was not sent because you are not signed on."
 
-#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -873,66 +580,51 @@
 "\n"
 "%s is typing..."
 
-#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "You have left this chat."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logging started. Future messages in this conversation will be logged."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logging stopped. Future messages in this conversation will not be logged."
 
-#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "Send To"
 
-#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "Clear Scrollback"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Show Timestamps"
 
-#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr "Add Buddy Pounce..."
 
-#: ../finch/gntconv.c:527
 msgid "Enable Logging"
 msgstr "Enable Logging"
 
-#: ../finch/gntconv.c:533
 msgid "Enable Sounds"
 msgstr "Enable Sounds"
 
-#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "List of users:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -940,7 +632,6 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -948,11 +639,9 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -960,43 +649,36 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Clears the conversation scrollback."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Show the list of users in the chat."
 
-#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Show the plugins window"
 
-#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Show the buddy list."
 
-#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Show the accounts window."
 
-#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Show the debug window."
 
-#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr "prefs: Show the preference window."
 
-#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Show the saved-statuses window."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+msgid "Unable to open file."
+msgstr "Unable to open file."
+
 msgid "Debug Window"
 msgstr "Debug Window"
 
@@ -1004,186 +686,186 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Clear"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filter: "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+msgid "Filter:"
+msgstr "Filter:"
+
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "File Transfers - %d%% of %d files"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progress"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filename"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Size"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Speed"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Remaining"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Close this window when all transfers finish"
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Clear finished transfers"
 
-#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Stop"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Failed"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+msgid "Sent"
+msgstr "Sent"
+
+msgid "Received"
+msgstr "Received"
+
+msgid "Finished"
+msgstr "Finished"
+
 #, c-format
 msgid "The file was saved as %s."
 msgstr "The file was saved as %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "Finished"
-
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
-msgid "Transferring"
-msgstr "Transferring"
-
-#: ../finch/gntnotify.c:165
+msgid "Sending"
+msgstr "Sending"
+
+msgid "Receiving"
+msgstr "Receiving"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversation in %s on %s"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversation with %s on %s"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+
+msgid "No logs were found"
+msgstr "No logs were found"
+
+msgid "Total log size:"
+msgstr "Total log size:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Scroll/Search: "
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Conversations in %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversations with %s"
+
+msgid "System Log"
+msgstr "System Log"
+
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "You have e-mail!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr "Sender"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "Subject"
 
-#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) has %d new message."
 msgstr[1] "%s (%s) has %d new messages."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "New Mail"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continue"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Join"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invite"
 
-#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(none)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+msgid "URI"
+msgstr "URI"
+
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
 msgstr "loading plugin failed"
 
-#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
 msgstr "unloading plugin failed"
 
-#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1200,19 +882,32 @@
 "Website: %s\n"
 "Filename: %s\n"
 
-#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Plugin needs to be loaded before you can configure it."
 
-#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "No configuration options for this plugin."
 
-#: ../finch/gntplugin.c:260
+msgid "Error loading plugin"
+msgstr "Error loading plugin"
+
+msgid "The selected file is not a valid plugin."
+msgstr "The selected file is not a valid plugin."
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Please open the debug window and try again to see the exact error message."
+
+msgid "Select plugin to install"
+msgstr "Select plugin to install"
+
 msgid "You can (un)load plugins from the following list."
 msgstr "You are (un)load plugins from the following list."
 
-#: ../finch/gntplugin.c:315
+msgid "Install Plugin..."
+msgstr "Install Plugin..."
+
 msgid "Configure Plugin"
 msgstr "Configure Plugin"
 
@@ -1221,362 +916,290 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
-#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Pounce on Whom"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Account:"
 
-#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Buddy name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "Pounce When Buddy..."
 
-#: ../finch/gntpounce.c:376
 msgid "Signs on"
 msgstr "Signs on"
 
-#: ../finch/gntpounce.c:377
 msgid "Signs off"
 msgstr "Signs off"
 
-#: ../finch/gntpounce.c:378
 msgid "Goes away"
 msgstr "Goes away"
 
-#: ../finch/gntpounce.c:379
 msgid "Returns from away"
 msgstr "Returns from away"
 
-#: ../finch/gntpounce.c:380
 msgid "Becomes idle"
 msgstr "Becomes idle"
 
-#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Is no longer idle"
 
-#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Starts typing"
 
-#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Pauses while typing"
 
-#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Stops typing"
 
-#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Sends a message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "Action"
 
-#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
 msgstr "Open a message window"
 
-#: ../finch/gntpounce.c:417
 msgid "Pop up a notification"
 msgstr "Pop up a notification"
 
-#: ../finch/gntpounce.c:418
 msgid "Send a message"
 msgstr "Send a message"
 
-#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "Execute a command"
 
-#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../finch/gntpounce.c:448
-msgid "Pounce only when my status is not available"
-msgstr "Pounce only when my status is not available"
-
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+msgid "Pounce only when my status is not Available"
+msgstr "Pounce only when my status is not Available"
+
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../finch/gntpounce.c:618
 msgid "Cannot create pounce"
 msgstr "Cannot create pounce"
 
-#: ../finch/gntpounce.c:619
 msgid "You do not have any accounts."
 msgstr "You do not have any accounts."
 
-#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr "You must create an account first before you can create a pounce."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Are you sure you want to delete the pounce on %s for %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Buddy Pounces"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s has paused while typing to you (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Based on keyboard use"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "From last sent message"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Never"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Show Idle Time"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Show Offline Buddies"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notify buddies when you are typing"
 
-#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Log format"
 
-#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "Log IMs"
 
-#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Log chats"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Log status change events"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Report Idle time"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Change status when idle"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutes before changing status"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Change status to"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Logging"
 
-#: ../finch/gntrequest.c:583
+msgid "You must fill all the required fields."
+msgstr "You must fill all the required fields."
+
+msgid "The required fields are underlined."
+msgstr "The required fields are underlined."
+
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Save File..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Open File..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Choose Location..."
+msgstr "Choose Location..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Press 'Enter' to find more rooms of this category."
+
+msgid "Get"
+msgstr "Get"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Room List"
+
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Message received"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Message sent"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
-msgid "Someone says your screen name in chat"
-msgstr "Someone says your screen name in chat"
-
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "Someone says your username in chat"
+msgstr "Someone says your username in chat"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Failure"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer failed to initialize."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr "(default)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Select Sound File ..."
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Sound Preferences"
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Profiles"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Console Beep"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Command"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "No Sounds"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Method: "
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1586,80 +1209,56 @@
 "(%s for filename)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Sounds when conversation has focus"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Always"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr "Only when available"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr "Only when not available"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Event"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "File"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Reset"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Choose..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Are you sure you want to delete \"%s\"?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Delete Status"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Title"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Type"
 
@@ -1671,130 +1270,72 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Use"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Invalid title"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Please enter a non-empty title for the status."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Duplicate title"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Please enter a different title for the status."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sub-status"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Message:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Edit Status"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Use different status for the following accounts"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Save & Use"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Sounds"
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Statuses"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Error loading the plugin."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Couldn't find X display"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Couldn't find window"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
 "This plugin cannot be loaded because it was not built with X11 support."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Clipboard plugin"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1802,77 +1343,60 @@
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s just signed on"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s just signed off"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s sent you a message"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s said your nick in %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s sent a message in %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Buddy signs on/off"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "You receive an IM"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Someone speaks in chat"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Someone says your name in chat"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notify with a toaster when"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Beep too!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Set URGENT for the terminal window."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toaster plugin"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<h1>Conversation with %s on %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "History Plug-in Requires Logging"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1884,15 +1408,12 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 
-#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1900,126 +1421,113 @@
 "When a new conversation is opened this plug-in will insert the last "
 "conversation into the current conversation."
 
-#: ../finch/plugins/lastlog.c:69
+#, c-format
+msgid "Online"
+msgstr "Online"
+
+msgid "Offline"
+msgstr "Offline"
+
+msgid "Online Buddies"
+msgstr "Online buddies"
+
+msgid "Offline Buddies"
+msgstr "Offline buddies"
+
+msgid "Online/Offline"
+msgstr "Online/Offline"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "No Grouping"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "Provides alternate buddylist grouping options."
+
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Searches for a substring in the backlog."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog plugin."
 
-#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Password is required to sign on."
 
-#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
-#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Save password"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plug-in for %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Original password"
 
-#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "New password"
 
-#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
-#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddies"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "buddy list"
 
-#: ../libpurple/certificate.c:545
 msgid "(DOES NOT MATCH)"
 msgstr "(DOES NOT MATCH)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s has presented the following certificate for just-this-once use:"
 
-#: ../libpurple/certificate.c:550
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2029,66 +1537,40 @@
 "Fingerprint (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
 msgid "Single-use Certificate Verification"
 msgstr "Single-use Certificate Verification"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
 msgid "Certificate Authorities"
 msgstr "Certificate Authorities"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
 msgid "SSL Peers Cache"
 msgstr "SSL Peers Cache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Accept certificate for %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
 msgid "SSL Certificate Verification"
 msgstr "SSL Certificate Verification"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
 msgid "Accept"
 msgstr "Accept"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Reject"
 
-#: ../libpurple/certificate.c:1188
 msgid "_View Certificate..."
 msgstr "_View Certificate..."
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2097,7 +1579,6 @@
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 
-#: ../libpurple/certificate.c:1331
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "The certificate chain presented for %s is not valid."
@@ -2107,16 +1588,13 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
 msgid "SSL Certificate Error"
 msgstr "SSL Certificate Error"
 
-#: ../libpurple/certificate.c:1340
 msgid "Invalid certificate chain"
 msgstr "Invalid certificate chain"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2125,13 +1603,11 @@
 "validated."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 
-#: ../libpurple/certificate.c:1408
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2142,12 +1618,22 @@
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 
-#: ../libpurple/certificate.c:1417
 msgid "Invalid certificate authority signature"
 msgstr "Invalid certificate authority signature"
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+
 #. Make messages
-#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2165,123 +1651,93 @@
 "Expiration date: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
 msgid "Certificate Information"
 msgstr "Certificate Information"
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: ../libpurple/connection.c:180
 msgid "Unregistration Error"
 msgstr "Unregistration Error"
 
-#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s signed on"
 
-#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s signed off"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Unable to send message: The message is too large."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Unable to send message to %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "The message is too large."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Send Message"
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Send Message"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to get connection: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Failed to get name: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Failed to get serv name: %s"
 
-#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is not running for the reason listed below"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "No name"
 
-#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "Unable to create new resolver process\n"
 
-#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "Unable to send request to resolver process\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2290,13 +1746,10 @@
 "Error resolving %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error resolving %s: %d"
 
-#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2305,21 +1758,17 @@
 "Error reading from resolver process:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
 #, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF while reading from resolver process"
 
-#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Thread creation failure: %s"
 
-#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2328,7 +1777,6 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2337,7 +1785,6 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2346,39 +1793,31 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Directory is not writable."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2389,135 +1828,105 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s is offering to send file %s"
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starting transfer of %s from %s"
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: ../libpurple/ft.c:685
 #, c-format
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "File transfer to %s failed."
 
-#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "File transfer from %s failed."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Run the command in a terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "The command used to handle \"aim\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "The command used to handle \"gg\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "The command used to handle \"icq\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "The command used to handle \"irc\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "The command used to handle \"msnim\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "The command used to handle \"sip\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "The command used to handle \"xmpp\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "The command used to handle \"ymsgr\" URLs, if enabled."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "The handler for \"aim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "The handler for \"gg\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "The handler for \"icq\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "The handler for \"irc\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "The handler for \"msnim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "The handler for \"sip\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "The handler for \"xmpp\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "The handler for \"ymsgr\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2525,7 +1934,6 @@
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2533,7 +1941,6 @@
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2541,7 +1948,6 @@
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2549,7 +1955,6 @@
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2557,7 +1962,6 @@
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2565,7 +1969,6 @@
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2573,7 +1976,6 @@
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2581,7 +1983,6 @@
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -2589,63 +1990,48 @@
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Whether the specified command should handle \"aim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Whether the specified command should handle \"gg\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Whether the specified command should handle \"icq\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Whether the specified command should handle \"irc\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Whether the specified command should handle \"msnim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Whether the specified command should handle \"sip\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Whether the specified command should handle \"xmpp\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Whether the specified command should handle \"ymsgr\" URLs"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Plain text"
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Old flat format"
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Logging of this conversation failed."
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2654,7 +2040,6 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2663,45 +2048,36 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "You are using %s, but this plugin requires %s."
 
-#: ../libpurple/plugin.c:380
 #, c-format
 msgid "This plugin has not defined an ID."
 msgstr "This plugin has not defined an ID."
 
-#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Plug-in magic mismatch %d (need %d)"
 
-#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI version mismatch %d.%d.x (need %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Plug-in does not implement all required functions"
 
-#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2710,89 +2086,59 @@
 "The required plug-in %s was not found. Please install this plug-in and try "
 "again."
 
-#: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
 msgstr "Unable to load the plug-in."
 
-#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plug-in %s could not be loaded."
 
-#: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
 msgstr "Unable to load your plug-in."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "The dependent plug-in %s could not be unloaded."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "There were errors unloading the plug-in."
-
-#: ../libpurple/plugins/autoaccept.c:23
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s requires %s, but it failed to unload."
+
 msgid "Autoaccept"
 msgstr "Autoaccept"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Auto-accept file transfer requests from selected users."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Autoaccept complete"
 
-#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "When a file-transfer request arrives from %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Set Autoaccept Setting"
 
-#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Save"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Ask"
 
-#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Auto Accept"
 
-#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Auto Reject"
 
-#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaccept File Transfers..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2800,11 +2146,9 @@
 "Path to save the files in\n"
 "(Please provide the full path)"
 
-#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatically reject from users not in buddy list"
 
-#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2812,16 +2156,12 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "Notes"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Enter your notes below..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Edit Notes..."
 
@@ -2833,18 +2173,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Store notes on particular buddies."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Adds the option to store notes for buddies on your buddy list."
 
@@ -2854,7 +2191,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Cipher Test"
 
@@ -2862,7 +2198,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Tests the ciphers that ship with libpurple."
 
@@ -2872,7 +2207,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus Example"
 
@@ -2880,8 +2214,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus Plug-in Example"
 
@@ -2891,7 +2223,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "File Control"
 
@@ -2899,50 +2230,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Allows control by entering commands in a file."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutes"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Set Account Idle Time"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Set"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "None of your accounts are idle."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Unset Account Idle Time"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Unset"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Set Idle Time for All Accounts"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Unset Idle Time For All Idled Accounts"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
@@ -2952,19 +2271,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC Test Client"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Test plug-in IPC support, as a client."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -2978,32 +2294,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC Test Server"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Test plug-in IPC support, as a server."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Test plug-in IPC support, as a server. This registers the IPC commands."
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Join/Part Hiding Configuration"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Minimum Room Size"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "User Inactivity Timeout (in minutes)"
 
@@ -3013,19 +2323,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Join/Part Hiding"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Hides extraneous join/part messages."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3037,34 +2344,25 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "User is offline."
 
-#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Auto-response sent:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s has signed off."
 
-#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "One or more messages may not have been delivered."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
-#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3072,77 +2370,65 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 
-#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Message could not be sent because the maximum length was exceeded."
 
-#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Message could not be sent."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "General Log Reading Configuration"
 
-#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Fast size calculations"
 
-#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Use name heuristics"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Log Directory"
 
@@ -3152,19 +2438,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Log Reader"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Includes other IM clients' logs in the log viewer."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3178,15 +2461,18 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono Plug-in Loader"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Loads .NET plug-ins with Mono."
 
+msgid "Add new line in IMs"
+msgstr "Add new line in IMs"
+
+msgid "Add new line in Chats"
+msgstr "Add new line in Chats"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3196,34 +2482,28 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "New Line"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Prepends a newline to displayed message."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
+"the username in the conversation window."
 msgstr ""
 "Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-
-#: ../libpurple/plugins/offlinemsg.c:23
+"the username in the conversation window."
+
 msgid "Offline Message Emulation"
 msgstr "Offline Message Emulation"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Save messages sent to an offline user as pounce."
 
-#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -3231,7 +2511,6 @@
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3240,43 +2519,21 @@
 "\"%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?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Offline Message"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Yes"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Save offline messages in pounce"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Do not ask. Always save in pounce."
 
@@ -3286,26 +2543,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl Plug-in Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plug-ins."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psychic Mode"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psychic mode for incoming conversation"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3313,23 +2565,18 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "You feel a disturbance in the force..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Only enable for users on the buddy list"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Disable when away"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Display notification message in conversations"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Raise psychic conversations"
 
@@ -3339,7 +2586,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -3347,8 +2593,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -3358,7 +2602,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Simple Plug-in"
 
@@ -3366,13 +2609,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr "X.509 Certificates"
 
@@ -3382,7 +2622,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3390,8 +2629,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -3401,7 +2638,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
 msgid "NSS"
 msgstr "NSS"
 
@@ -3409,8 +2645,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -3420,7 +2654,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3428,48 +2661,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s has signed on."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notify When"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Buddy Goes _Away"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Buddy Becomes _Idle"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Buddy _Signs On/Off"
 
@@ -3479,7 +2702,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
@@ -3487,8 +2709,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3496,15 +2716,12 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plug-in Loader"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plug-ins"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3512,52 +2729,36 @@
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Unable to listen for incoming IM connections\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Unable to establish connection with the local mDNS server - is it running?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Forename"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM Account"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP Account"
 
@@ -3571,61 +2772,43 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protocol Plug-in"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple Person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s has closed the conversation."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send the message: the conversation couldn't be started."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Cannot open socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Error setting socket options"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Could not bind socket to port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Could not listen on socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+msgid "Error communicating with local mDNSResponder."
+msgstr "Error communicating with local mDNSResponder."
+
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3633,355 +2816,213 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Token Error"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Unable to fetch the token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Send Buddylist..."
 
-#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Your buddylist is empty, nothing was written to the file."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Couldn't open file"
-
-#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Buddylist saved successfully!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Couldn't write buddy list for %s to %s"
+
 msgid "Couldn't load buddylist"
 msgstr "Couldn't load buddy list"
 
-#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Load Buddylist..."
 
-#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Buddylist loaded successfully!"
 
-#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Save buddylist..."
 
-#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Fill in the registration fields."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Unable to register new account. Error occurred.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "New Gadu-Gadu Account Registered"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registration completed successfully!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Password"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Password (retype)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Enter current token"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Current token"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
 
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Please fill in the following fields"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "City"
 
-#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Gender"
 
-#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Male or female"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Male"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Female"
 
-#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Only online"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Find buddies"
 
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Please enter your search criteria below"
 
-#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Fill in the fields."
 
-#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Your current password is different from the one that you specified."
 
-#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Unable to change password. An error occured.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Change password for the Gadu-Gadu account"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Password successfully changed!"
 
-#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Current password"
 
-#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Change Gadu-Gadu password"
 
-#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Select a chat for buddy: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Offline"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Available"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Away"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Forename"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "Unable to display the search results."
 
-#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Public Directory"
 
-#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Search results"
 
-#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "No matching users found"
 
-#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "There are no users matching your search criteria."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
 
-#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Your buddy list was downloaded from the server."
 
-#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Buddy list uploaded"
 
-#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Connection failed."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
-msgid "Blocked"
-msgstr "Blocked"
-
-#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Add to chat"
 
-#: ../libpurple/protocols/gg/gg.c:1653
-msgid "Unblock"
-msgstr "Unblock"
-
-#: ../libpurple/protocols/gg/gg.c:1657
-msgid "Block"
-msgstr "Block"
-
-#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Chat error"
 
-#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Not connected to the server."
 
-#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Find buddies..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Change password..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Upload buddylist to Server"
 
-#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Download buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Delete buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Save buddylist to file..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
@@ -3996,151 +3037,81 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plug-in"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Polish popular IM system"
 
-#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
 msgstr "Could not open a listening port."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Read error"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Users"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Topic"
 
@@ -4152,66 +3123,24 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plug-in that Sucks Less"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Encodings"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "Username"
-
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Real name"
 
@@ -4219,158 +3148,129 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Use SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#, c-format
+msgid "Ban on %s by %s, set %ld seconds ago"
+msgstr "Ban on %s by %s, set %ld seconds ago"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "Ban on %s"
+
+msgid "End of ban list"
+msgstr "End of ban list"
+
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Banned"
 
-#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Cannot ban %s: banlist is full"
 
-#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Nick"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Currently on"
 
-#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Idle for"
 
-#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Online since"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Defining adjective:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s has cleared the topic."
 
-#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "The IRC server received a message it did not understand."
 
-#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Time Response"
 
-#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "no such channel"
 
-#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Could not send"
 
-#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4378,7 +3278,6 @@
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4386,53 +3285,40 @@
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Cannot join %s: Registration required."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick or channel is temporarily unavailable."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4440,11 +3326,9 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Send a command to chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4452,7 +3336,6 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4462,7 +3345,6 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4470,7 +3352,6 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4478,7 +3359,6 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4486,7 +3366,6 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4494,7 +3373,6 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4502,15 +3380,12 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Send a command to memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4518,7 +3393,6 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4526,20 +3400,18 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Send a command to nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  Send a notice to a user or channel."
+
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4547,7 +3419,6 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4555,11 +3426,9 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Send a command to operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4567,7 +3436,6 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4575,7 +3443,6 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4583,15 +3450,12 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4599,23 +3463,18 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Displays the current local time at the IRC server."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nick]: send CTCP VERSION request to a user"
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4623,7 +3482,6 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4631,60 +3489,43 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  Get information on a user."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nick&gt;: Get information on a user that has logged off."
 
-#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad-Hoc Command Failed"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
 msgid "execute"
 msgstr "execute"
 
-#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "You require encryption, but no TLS/SSL support found."
+
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4693,148 +3534,72 @@
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
-msgid "Server does not use any supported authentication method"
-msgstr "Server does not use any supported authentication method"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+msgid "Server does not use any supported authentication method"
+msgstr "Server does not use any supported authentication method"
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL error"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Street Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Locality"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Region"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Postal Code"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Country"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Role"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Edit XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4842,386 +3607,231 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Operating System"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
 msgstr "Last Activity"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Service Discovery Info"
 msgstr "Service Discovery Info"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
 msgstr "Service Discovery Items"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Extended Stanza Addressing"
 msgstr "Extended Stanza Addressing"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
 msgstr "Multi-User Chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Multi-User Chat Extended Presence Information"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
 msgstr "In-Band Bytestreams"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "Ad-Hoc Commands"
 msgstr "Ad-Hoc Commands"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
 msgstr "PubSub Service"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
 msgstr "SOCKS5 Bytestreams"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
 msgstr "Out of Band Data"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "In-Band Registration"
 msgstr "In-Band Registration"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "User Location"
 msgstr "User Location"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Avatar"
 msgstr "User Avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Chat State Notifications"
 msgstr "Chat State Notifications"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Software Version"
 msgstr "Software Version"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Stream Initiation"
 msgstr "Stream Initiation"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "File Transfer"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "User Mood"
 msgstr "User Mood"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Activity"
 msgstr "User Activity"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "Entity Capabilities"
 msgstr "Entity Capabilities"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
 msgstr "Encrypted Session Negotiations"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "User Tune"
 msgstr "User Tune"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "Roster Item Exchange"
 msgstr "Roster Item Exchange"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Reachability Address"
 msgstr "Reachability Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "User Profile"
 msgstr "User Profile"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
 msgstr "Jingle Audio"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "User Nickname"
 msgstr "User Nickname"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
 msgstr "Jingle Raw UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Video"
 msgstr "Jingle Video"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
 msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Message Receipts"
 msgstr "Message Receipts"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Public Key Publishing"
 msgstr "Public Key Publishing"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "User Chatting"
 msgstr "User Chatting"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Browsing"
 msgstr "User Browsing"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Gaming"
 msgstr "User Gaming"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Viewing"
 msgstr "User Viewing"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Stanza Encryption"
 msgstr "Stanza Encryption"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr "Entity Time"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
 msgstr "Delayed Delivery"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
 msgstr "Collaborative Data Objects"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
 msgstr "File Repository and Sharing"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
 msgstr "STUN Service Discovery for Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Simplified Encrypted Session Negotiation"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
 msgstr "Hop Check"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Resource"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Priority"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
 msgid "Log In"
 msgstr "Log In"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
 msgid "Log Out"
 msgstr "Log Out"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5229,181 +3839,118 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "Directory Query Failed"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
 msgstr "Could not query the directory server."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server Instructions: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Fill in one or more fields to search for any matching XMPP users."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "Search for XMPP users"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Search"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "Invalid Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Enter a User Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Select a user directory to search"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Search Directory"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Room:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registration error"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Error initializing session"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
 msgstr "You require encryption, but it is not available on this server."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Write error"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+msgid "Ping timeout"
+msgstr "Ping timeout"
+
 msgid "Read Error"
 msgstr "Read Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5412,611 +3959,410 @@
 "Could not establish a connection with the server:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Invalid XMPP ID. Domain must be set."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registration to %s successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registration from %s successfully removed"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
 msgid "Unregistration Successful"
 msgstr "Unregistration Successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
 msgid "Unregistration Failed"
 msgstr "Unregistration Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "County/State"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
 msgid "Unregister"
 msgstr "Unregister"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Please fill out the information below to change your account registration."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr "Register New XMPP Account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Register"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Change Account Registration at %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Register New Account at %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Change Registration"
 msgstr "Change Registration"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
 msgid "Error unregistering account"
 msgstr "Error unregistering account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
 msgid "Account successfully unregistered"
 msgstr "Account successfully unregistered"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
 msgid "Initializing SSL/TLS"
 msgstr "Initialising SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Both"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "From"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "None"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Subscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Mood"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Now Listening"
+msgstr "Now Listening"
+
 msgid "Mood Text"
 msgstr "Mood Text"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Allow Buzz"
+msgstr "Allow Buzz"
+
 msgid "Tune Artist"
 msgstr "Tune Artist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Tune Title"
 msgstr "Tune Title"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
 msgstr "Tune Album"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
 msgstr "Tune Genre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
 msgid "Tune Comment"
 msgstr "Tune Comment"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
 msgstr "Tune Track"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
 msgstr "Tune Time"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
 msgstr "Tune Year"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
 msgstr "Tune URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-msgid "Allow Buzz"
-msgstr "Allow Buzz"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Change Password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "Search for Users..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr "Malformed XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unknown affiliation: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Unable to affiliate user %s as \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unknown role: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Unable to set role \"%s\" for user: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Unable to ping user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Unable to buzz, because there is nothing known about user %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Unable to buzz, because user %s might be offline."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Unable to buzz, because the user %s does not support it."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Buzz"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s has buzzed you!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzzing %s..."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
-
-#: ../libpurple/protocols/jabber/jabber.c:2289
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."
+
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6024,7 +4370,6 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6032,30 +4377,23 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#: ../libpurple/protocols/jabber/jabber.c:2313
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
-
-#: ../libpurple/protocols/jabber/jabber.c:2318
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [password]:  Join a chat on this server."
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;user&gt; [reason]:  Kick a user from the room."
+
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing a user/component/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz a user to get their attention"
 
@@ -6069,98 +4407,70 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP Protocol Plug-in"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
 msgstr "Require SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Force old (port 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Connect port"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Connect server"
 
-#: ../libpurple/protocols/jabber/message.c:106
+msgid "File transfer proxies"
+msgstr "File transfer proxies"
+
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s has left the conversation."
 
-#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "XMPP Message Error"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "%s has buzzed you!"
-msgstr "%s has buzzed you!"
-
-#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6168,86 +4478,65 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configure Room"
 
-#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
-#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Unable to send file to %s, user does not support file transfers"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Unable to send file to %s, invalid JID"
 
-#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Unable to send file to %s, user is not online"
 
-#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "Unable to send file to %s, not subscribed to user presence"
 
-#: ../libpurple/protocols/jabber/si.c:857
-#, c-format
-msgid "Please select which resource of %s you would like to send a file to"
-msgstr "Please select which resource of %s you would like to send a file to"
-
-#: ../libpurple/protocols/jabber/si.c:873
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+"Please select the resource of %s to which you would like to send a file"
+
 msgid "Select a Resource"
 msgstr "Select a Resource"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
 msgid "Edit User Mood"
 msgstr "Edit User Mood"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
 msgid "Please select your mood from the list."
 msgstr "Please select your mood from the list."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Set"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
 msgid "Set Mood..."
 msgstr "Set Mood..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Set User Nickname"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Please specify a new nickname for yourself."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6255,24 +4544,22 @@
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
 msgid "Set Nickname..."
 msgstr "Set Nickname..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Actions"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Select an action"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Unable to retrieve MSN Address Book"
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Buddy list synchronisation issue in %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6281,7 +4568,6 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6290,332 +4576,258 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#: ../libpurple/protocols/msn/error.c:36
 #, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#: ../libpurple/protocols/msn/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a client bug)"
 
-#: ../libpurple/protocols/msn/error.c:46
 #, c-format
 msgid "Invalid e-mail address"
 msgstr "Invalid e-mail address"
 
-#: ../libpurple/protocols/msn/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#: ../libpurple/protocols/msn/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully qualified domain name missing"
 
-#: ../libpurple/protocols/msn/error.c:56
 #, c-format
 msgid "Already logged in"
 msgstr "Already logged in"
 
-#: ../libpurple/protocols/msn/error.c:59
-#, c-format
-msgid "Invalid screen name"
-msgstr "Invalid screen name"
-
-#: ../libpurple/protocols/msn/error.c:62
+#, c-format
+msgid "Invalid username"
+msgstr "Invalid username"
+
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Invalid friendly name"
 
-#: ../libpurple/protocols/msn/error.c:65
 #, c-format
 msgid "List full"
 msgstr "List full"
 
-#: ../libpurple/protocols/msn/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#: ../libpurple/protocols/msn/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#: ../libpurple/protocols/msn/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#: ../libpurple/protocols/msn/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#: ../libpurple/protocols/msn/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#: ../libpurple/protocols/msn/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#: ../libpurple/protocols/msn/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#: ../libpurple/protocols/msn/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#: ../libpurple/protocols/msn/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#: ../libpurple/protocols/msn/error.c:103
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a user to a group that doesn't exist"
 
-#: ../libpurple/protocols/msn/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#: ../libpurple/protocols/msn/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "Notify transfer failed"
 
-#: ../libpurple/protocols/msn/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#: ../libpurple/protocols/msn/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#: ../libpurple/protocols/msn/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
 msgstr "Service temporarily unavailable"
 
-#: ../libpurple/protocols/msn/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#: ../libpurple/protocols/msn/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#: ../libpurple/protocols/msn/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#: ../libpurple/protocols/msn/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#: ../libpurple/protocols/msn/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#: ../libpurple/protocols/msn/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#: ../libpurple/protocols/msn/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "Peer notification server down"
 
-#: ../libpurple/protocols/msn/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#: ../libpurple/protocols/msn/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#: ../libpurple/protocols/msn/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: ../libpurple/protocols/msn/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#: ../libpurple/protocols/msn/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#: ../libpurple/protocols/msn/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#: ../libpurple/protocols/msn/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#: ../libpurple/protocols/msn/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#: ../libpurple/protocols/msn/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#: ../libpurple/protocols/msn/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#: ../libpurple/protocols/msn/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
-#: ../libpurple/protocols/msn/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#: ../libpurple/protocols/msn/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
 #, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../libpurple/protocols/msn/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#: ../libpurple/protocols/msn/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#: ../libpurple/protocols/msn/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#: ../libpurple/protocols/msn/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#: ../libpurple/protocols/msn/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unknown Error Code %d"
 
-#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
 msgstr "Nudge"
 
-#: ../libpurple/protocols/msn/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s has nudged you!"
 
-#: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Nudging %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Set your home telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Set your work telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6623,321 +4835,226 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Allow"
 
-#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Disallow"
 
-#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "This Hotmail account may not be active."
 
-#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Page"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Has you"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+msgid "Home Phone Number"
+msgstr "Home Phone Number"
+
+msgid "Work Phone Number"
+msgstr "Work Phone Number"
+
+msgid "Mobile Phone Number"
+msgstr "Mobile Phone Number"
+
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr "Artist"
+
+msgid "Album"
+msgstr "Album"
+
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name..."
 
-#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Set Home Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Set Work Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Set Mobile Phone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Enable/Disable Mobile Devices..."
 
-#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Allow/Disallow Mobile Pages..."
 
-#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail Inbox"
 
-#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL support is needed for MSN. Please install a supported SSL library."
 
-#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Age"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Location"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Pets"
 
-#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "Home town"
 
-#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "Places Lived"
 
-#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "Fashion"
 
-#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Music"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "Contact Info"
 
-#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "Partner"
 
-#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "Home Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "Home Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "Home Address"
 
-#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Personal Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "Personal E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "Personal IM"
 
-#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "Work"
 
-#: ../libpurple/protocols/msn/msn.c:1677
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Company"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Department"
 
-#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Work Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Work Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Work Address"
 
-#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "Work Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "Work Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "Work E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "Work IM"
 
-#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6947,7 +5064,6 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6955,8 +5071,6 @@
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 
-#: ../libpurple/protocols/msn/msn.c:1872
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profile URL"
 
@@ -6970,101 +5084,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protocol Plug-in"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger Protocol Plugin"
+
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC Test Server"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "HTTP Method Server"
+
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
-#: ../libpurple/protocols/msn/notification.c:178
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID authentication: Unable to connect"
+
+#. we must have failed!
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID authentication failed"
+
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s is not a valid group."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s on %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s just sent you a Nudge!"
+
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error (%d)"
+
+msgid "Unable to add user"
+msgstr "Unable to add user"
+
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Unable to add user on %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Unable to block user on %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Unable to permit user on %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s could not be added because your buddy list is full."
 
-#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is not a valid passport account."
 
-#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Service Temporarily Unavailable."
 
-#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7095,15 +5194,15 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: ../libpurple/protocols/msn/servconn.c:137
+msgid "Unable to connect"
+msgstr "Unable to connect"
+
 msgid "Writing error"
 msgstr "Writing error"
 
-#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Reading error"
 
-#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7112,94 +5211,73 @@
 "Connection error from %s server:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Our protocol is not supported by the server."
 
-#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Error parsing HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
-#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Unable to authenticate: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: ../libpurple/protocols/msn/session.c:349
+msgid "Transferring"
+msgstr "Transferring"
+
 msgid "Starting authentication"
 msgstr "Starting authentication"
 
-#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Getting cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Sending cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Message may have not been sent because a timeout occurred:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Message could not be sent; not allowed while invisible:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Message could not be sent because the user is offline:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Message could not be sent because a connection error occured:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Message could not be sent because we are sending too quickly:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7207,44 +5285,54 @@
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Message could not be sent because an error with the switchboard occurred:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s has added you to his or her buddy list."
 
-#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s has removed you from his or her buddy list."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Unable to add \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "The screen name specified is invalid."
-
-#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "The username specified is invalid."
+msgstr "The username specified is invalid."
+
+msgid "Has you"
+msgstr "Has you"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "MSN Protocol Plug-in"
+
 msgid "Missing Cipher"
 msgstr "Missing Cipher"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "The RC4 cipher could not be found"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7252,150 +5340,113 @@
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
-msgstr "MySpaceIM Error"
-
-#: ../libpurple/protocols/myspace/myspace.c:349
 msgid "Reading challenge"
 msgstr "Reading challenge"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Unexpected challenge length from server"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Logging in"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Connection to server lost (no data received within %d seconds)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
 msgid "New mail messages"
 msgstr "New mail messages"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr "New blog comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr "New profile comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr "New friend requests!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr "New picture comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
 msgstr "MySpace"
 
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - No Username Set"
+
+msgid "You appear to have no MySpace username."
+msgstr "You appear to have no MySpace username."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-msgid "No username set"
-msgstr "No username set"
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol error, code %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM Error"
+
 msgid "Failed to add buddy"
 msgstr "Failed to add buddy"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' command failed."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
 msgid "persist command failed"
 msgstr "persist command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr "No such user: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
 msgid "User lookup"
 msgstr "User lookup"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "Failed to remove buddy"
 msgstr "Failed to remove buddy"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "blocklist command failed"
 msgstr "blocklist command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
 msgid "Invalid input condition"
 msgstr "Invalid input condition"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-msgid "Read buffer full"
-msgstr "Read buffer full"
-
-#: ../libpurple/protocols/myspace/myspace.c:2402
+msgid "Read buffer full (2)"
+msgstr "Read buffer full (2)"
+
 msgid "Unparseable message"
 msgstr "Unparseable message"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Couldn't connect to host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
 msgid "IM Friends"
 msgstr "IM Friends"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7404,313 +5455,286 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
 msgid "Add contacts from server"
 msgstr "Add contacts from server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr "Add friends from MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
 msgid "Importing friends failed"
 msgstr "Importing friends failed"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr "Find people..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
 msgid "Change IM name..."
 msgstr "Change IM name..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr "myim URL handler"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "No suitable MySpaceIM account could be found to open this myim URL."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Enable the proper MySpaceIM account and try again."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr "Show display name in status text"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
 msgstr "Show headline in status text"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
 msgid "Send emoticons"
 msgstr "Send emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr "Screen resolution (dots per inch)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
 msgid "Base font size (points)"
 msgstr "Base font size (points)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "User"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "Profile"
 
-#: ../libpurple/protocols/myspace/user.c:124
 msgid "Headline"
 msgstr "Headline"
 
-#: ../libpurple/protocols/myspace/user.c:129
 msgid "Song"
 msgstr "Song"
 
-#: ../libpurple/protocols/myspace/user.c:134
 msgid "Total Friends"
 msgstr "Total Friends"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
 msgid "Client Version"
 msgstr "Client Version"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "No username set"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Please Set a Username"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Please enter a username to check its availability:"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Username Available"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "This username is available. Would you like to set it?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "ONCE SET, THIS CANNOT BE CHANGED!"
+
+msgid "This username is unavailable."
+msgstr "This username is not available."
+
+msgid "Please try another username:"
+msgstr "Please try another username:"
+
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
 msgid "Zap"
 msgstr "Zap"
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s has zapped you!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zapping %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
 msgstr "Whack"
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s has whacked you!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, c-format
 msgid "Whacking %s..."
 msgstr "Whacking %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
 msgid "Torch"
 msgstr "Torch"
 
-#: ../libpurple/protocols/myspace/zap.c:46
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s has torched you!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
 #, c-format
 msgid "Torching %s..."
 msgstr "Torching %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
 msgstr "Smooch"
 
-#: ../libpurple/protocols/myspace/zap.c:47
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s has smooched you!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
 #, c-format
 msgid "Smooching %s..."
 msgstr "Smooching %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
 msgstr "Hug"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s has hugged you!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "Hugging %s..."
 msgstr "Hugging %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
 msgstr "Slap"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s has slapped you!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Slapping %s..."
 msgstr "Slapping %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
 msgid "Goose"
 msgstr "Goose"
 
-#: ../libpurple/protocols/myspace/zap.c:50
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s has goosed you!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
 #, c-format
 msgid "Goosing %s..."
 msgstr "Goosing %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
 msgid "High-five"
 msgstr "High-five"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s has high-fived you!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "High-fiving %s..."
 msgstr "High-fiving %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
 msgstr "Punk"
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s has punk'd you!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
 msgid "Punking %s..."
 msgstr "Punking %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
 msgid "Raspberry"
 msgstr "Raspberry"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s has raspberried you!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Raspberrying %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Required parameters not passed in"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Unable to write to network"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Unable to read from network"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Error communicating with server"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conference not found"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Conference does not exist"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "A folder with that name already exists"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Password has expired"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Incorrect password"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "User not found"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "The server could not access the directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Your system administrator has disabled this operation"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "The server is unavailable; try again later"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Cannot add a contact to the same folder twice"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Cannot add yourself"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Incorrect screen name or password."
-
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "Could not recognise the host of the screen name you entered"
-
-#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid "Incorrect username or password"
+msgstr "Incorrect username or password"
+
+msgid "Could not recognize the host of the username you entered"
+msgstr "Could not recognise the host of the username you entered"
+
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -7718,31 +5742,24 @@
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "You cannot add the same person twice to a conversation"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "You have reached your limit for the number of contacts allowed"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
-msgstr "You have entered an incorrect screen name"
-
-#: ../libpurple/protocols/novell/nmuser.c:1941
+msgid "You have entered an incorrect username"
+msgstr "You have entered an incorrect username"
+
 msgid "An error occurred while updating the directory"
 msgstr "An error occurred while updating the directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Incompatible protocol version"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "The user has blocked you"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7750,53 +5767,42 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "The user is either offline or you are blocked"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Unable to send message. Could not get details for user (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Unable to add %s to your buddy list (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Unable to send message to %s. Could not create the conference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Unable to send message. Could not create the conference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7805,7 +5811,6 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7814,62 +5819,46 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Could not get details for user %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Unable to add user to privacy list (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Unable to add %s to deny list (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Unable to add %s to permit list (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Unable to remove %s from privacy list (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Unable to change server side privacy settings (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "User ID"
 
@@ -7879,41 +5868,29 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Full name"
 
-#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "Unable to make SSL connection to server."
-
-#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7924,16 +5901,12 @@
 "\n"
 "Sent: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "You have been logged out because you logged in at another workstation."
 
-#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7941,11 +5914,6 @@
 "%s appears to be offline and did not receive the message that you have just "
 "sent."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7953,11 +5921,9 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: ../libpurple/protocols/novell/novell.c:2504
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
@@ -7972,33 +5938,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plug-in"
 
-#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Server address"
 
-#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Server port"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+msgid "Could not join chat room"
+msgstr "Could not join chat room"
+
+msgid "Invalid chat room name"
+msgstr "Invalid chat room name"
+
 msgid "Server closed the connection."
 msgstr "Server closed the connection."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8007,10 +5964,6 @@
 "Lost connection with server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "Received invalid data on connection with server."
 
@@ -8024,8 +5977,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM Protocol Plugin"
 
@@ -8039,144 +5990,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ Protocol Plugin"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Encoding"
 
-#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "The remote user has closed the connection."
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "The remote user has declined your request."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Lost connection with the remote user:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Received invalid data on connection with remote user."
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Could not establish a connection with the remote user."
 
-#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direct IM established"
 
-#: ../libpurple/protocols/oscar/oft.c:656
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "File %s is %s, which is larger than the maximum size of %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Request denied"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "No match"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "List overflow"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Queue full"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8188,7 +6110,6 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8198,153 +6119,98 @@
 "different encodings selected, or %s has a buggy client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voice"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Chat"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Get File"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Games"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP User"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
 #, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
 #, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
 #, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 #, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "Online"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8353,7 +6219,6 @@
 "Could not connect to authentication server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8362,53 +6227,43 @@
 "Could not connect to BOS server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
-msgstr "Screen name sent"
-
-#: ../libpurple/protocols/oscar/oscar.c:1048
+msgid "Username sent"
+msgstr "Username sent"
+
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalising connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
-msgid "Invalid screen name."
-msgstr "Invalid screen name."
-
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+
+#. Unregistered screen name
+msgid "Invalid username."
+msgstr "Invalid username."
+
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
 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."
@@ -8416,44 +6271,32 @@
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Enter the 6 digit number from the digital display."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8462,53 +6305,37 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "Unable to get a valid AIM login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "You may be disconnected shortly.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "Unable to get a valid login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Password sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Unable to initialise connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "No reason given."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8519,17 +6346,14 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "The user %u has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8542,7 +6366,6 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8555,7 +6378,6 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8568,38 +6390,31 @@
 "Message is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "You missed %hu message from %s because it was invalid."
 msgstr[1] "You missed %hu messages from %s because they were invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "You missed %hu message from %s because it was too large."
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8610,21 +6425,18 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "You missed %hu message from %s because he/she was too evil."
 msgstr[1] "You missed %hu messages from %s because he/she was too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "You missed %hu message from %s because you are too evil."
 msgstr[1] "You missed %hu messages from %s because you are too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8632,47 +6444,34 @@
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "Online Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "Available Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8680,7 +6479,6 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8688,124 +6486,90 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
-#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Work Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "The following screen name is associated with %s"
-msgstr[1] "The following screen names are associated with %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:3922
-msgid "Screen name"
-msgstr "Screen name"
-
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "The following username is associated with %s"
+msgstr[1] "The following usernames are associated with %s"
+
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No results found for e-mail address %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "You should receive an e-mail asking to confirm %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
-msgid "Error Changing Account Info"
-msgstr "Error Changing Account Info"
-
-#: ../libpurple/protocols/oscar/oscar.c:4005
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-
-#: ../libpurple/protocols/oscar/oscar.c:4008
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Error 0x%04x: Unable to format screen name because it is invalid."
-
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "Error 0x%04x: Unable to format username because it is invalid."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-
-#: ../libpurple/protocols/oscar/oscar.c:4017
+"request pending for this username."
+
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-
-#: ../libpurple/protocols/oscar/oscar.c:4020
+"too many usernames associated with it."
+
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8814,31 +6578,28 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+msgid "Error Changing Account Info"
+msgstr "Error Changing Account Info"
+
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "The e-mail address for %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8848,7 +6609,6 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8863,11 +6623,9 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8882,48 +6640,35 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#, c-format
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+"list is not lost, and will probably become available in a few minutes."
+
 msgid "Orphans"
 msgstr "Orphans"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8932,41 +6677,33 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(no name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Could not add the buddy %s for an unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "The user %s has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8977,51 +6714,35 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "Invalid chat name specified."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "Away Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(retrieving)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9029,64 +6750,48 @@
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "Get AIM Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Require authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (enabling this will cause you to receive spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privacy Options"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Screen name formatting can change only capitalisation and whitespace."
-
-#: ../libpurple/protocols/oscar/oscar.c:6164
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "Username formatting can change only capitalisation and whitespace."
+
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9094,101 +6799,75 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Find Buddy by E-Mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Type the e-mail address of the buddy you are searching for."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "_Search"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
-msgid "Set User Info (URL)..."
-msgstr "Set User Info (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6405
-msgid "Change Password (URL)"
-msgstr "Change Password (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6409
-msgid "Configure IM Forwarding (URL)"
-msgstr "Configure IM Forwarding (URL)"
+msgid "Set User Info (web)..."
+msgstr "Set User Info (web)..."
+
+msgid "Change Password (web)"
+msgstr "Change Password (web)"
+
+msgid "Configure IM Forwarding (web)"
+msgstr "Configure IM Forwarding (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Display Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Change Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Search for Buddy by E-mail Address..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-msgid "Use recent buddies group"
-msgstr "Use recent buddies group"
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Show how long you have been idle"
-msgstr "Show how long you have been idle"
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-
-#: ../libpurple/protocols/oscar/peer.c:697
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect via proxy server."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s has just asked to directly connect to %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9198,172 +6877,129 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Primary Information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Personal Introduction"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ Number"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Country/Region"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "County/Province/State"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoscope Symbol"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Zodiac Sign"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Blood Group"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "College/University"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "Email"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobile Number"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telephone Number"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Aquarius"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Pisces"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Aries"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Taurus"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Gemini"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Cancer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virgo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Libra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Scorpio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sagittarius"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricorn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Ox"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Rabbit"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Dragon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Snake"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Horse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Goat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Monkey"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Rooster"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Dog"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Pig"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Other"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Modify my information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Update my information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Your information has been updated"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9372,216 +7008,151 @@
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Invalid QQ Face"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "You rejected %d's request"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Enter your reason:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Reject request"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Sorry, you are not my type..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Add buddy with auth request failed"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "You have successfully removed a buddy"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "You have successfully removed yourself from your friend's buddy list"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "User %d needs authentication"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Enter request here"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Would you like to be my friend?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Send"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "You have added %d to buddy list"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid Error"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Invalid QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Group ID"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Creator"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Group Description"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Auth"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Please enter external group ID"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "You can only search for permanent QQ groups\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "User %d requested to join group %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Reason: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Approve"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Your request to join group %d has been rejected by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Your request to join group %d has been approved by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "You [%d] have left group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "You [%d] have been added to group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "This group has been added to your buddy list"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "I am not a member"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "I am a member"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "I am applying to join"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "I am the admin"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Unknown status"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "This group does not allow others to join"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "You have successfully left the group"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ Group Auth"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Your authorisation request has been accepted by the QQ server"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "You entered a group ID outside the acceptable range"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Are you sure you want to leave this Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -9589,155 +7160,120 @@
 "Note: if you are the creator \n"
 "this operation will eventually remove this Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Group Operation Error"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Do you want to approve the request?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
 msgstr "Enter your reason:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr "You have successfully modified Qun member"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr "You have successfully modified Qun information"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "You have successfully created a Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Would you like to set up the Qun details now?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "System Message"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Failed to send IM."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error"
 msgstr "Keep alive error"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
 msgstr "Error requesting login token"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
-msgid "Unable to login, check debug log"
-msgstr "Unable to login; check debug log"
+msgid "Unable to login. Check debug log."
+msgstr "Unable to login. Check debug log"
+
+msgid "Unable to login"
+msgstr "Unable to login"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Unknown-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
 msgid "TCP Address"
 msgstr "TCP Address"
 
-#: ../libpurple/protocols/qq/qq.c:213
 msgid "UDP Address"
 msgstr "UDP Address"
 
-#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Level"
 
-#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Invalid name"
 
-#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Currently Online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Last Refreshed</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Connection Mode</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>My Public IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Login Time</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Last Login IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Last Login Time</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Login Information"
 
-#: ../libpurple/protocols/qq/qq.c:533
 msgid "Set My Information"
 msgstr "Set My Information"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Change Password"
 
-#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Show Login Information"
 
-#: ../libpurple/protocols/qq/qq.c:560
 msgid "Leave this QQ Qun"
 msgstr "Leave this QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Block this buddy"
 
@@ -9751,225 +7287,170 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protocol\tPlugin"
 
-#: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
 msgstr "Connect using TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Socket error"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Unable to read from socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d has declined the file %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "File Send"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelled the transfer of %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Connection lost"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Login failed; no reply"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr "Do you want to add this buddy?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "You have been added by %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Would you like to add this person?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s has added you [%s] to his or her buddy list"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "User %s rejected your request"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr "User %s approved your request"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s wants to add you [%s] as a friend"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Message: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s is not in your buddy list"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Connection closed (writing)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Group Title:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes Group ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info for Group %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes Address Book Information"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Invite Group to Conference..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Get Notes Address Book Info"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Sending Handshake"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Waiting for Handshake Acknowledgement"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake Acknowledged, Sending Login"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Waiting for Login Acknowledgement"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Login Redirected"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Forcing Login"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Login Acknowledged"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Starting Services"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "A Sametime administrator has issued the following announcement on server %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime Administrator Announcement"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Connection reset"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error reading from socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Unable to connect to host"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Announcement from %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Conference Closed"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Unable to send message: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place Closed"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Speakers"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Video Camera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Supports"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "External User"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Create conference with user"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9978,27 +7459,21 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "New Conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Create"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Available Conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Create New Conference..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Invite user to a conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10009,27 +7484,21 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Invite to Conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Invite to Conference..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Send TEST Announcement"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "No Sametime Community Server specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10038,42 +7507,31 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile Connection Setup"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "No Sametime Community Server Specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Connect"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unknown (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Last Known Client"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "User Name"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "An ambiguous user ID was entered"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10082,15 +7540,12 @@
 "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."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Select User"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Unable to add user: user not found"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10099,11 +7554,6 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Unable to add user"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10112,63 +7562,48 @@
 "Error reading file %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Remotely Stored Buddy List"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Buddy List Storage Mode"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Local Buddy List Only"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Merge List from Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Merge and Save List to Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synchronise List with Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import Sametime List for Account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export Sametime List for Account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Unable to add group: group exists"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "A group named '%s' already exists in your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Unable to add group"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Possible Matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes Address Book group results"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10179,15 +7614,12 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Select Notes Address Book"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Unable to add group: group not found"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10196,11 +7628,9 @@
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes Address Book Group"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10208,12 +7638,10 @@
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Search results for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10224,29 +7652,23 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Search Results"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "No matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "The identifier '%s' did not match any users in your Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "No Matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Search for a user"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10254,115 +7676,59 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "User Search"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Import Sametime List..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Export Sametime List..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Add Notes Address Book Group..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "User Search..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Force login (ignore server redirects)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Hide client identity"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s is not present in the network"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Cannot perform the key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Error occurred during key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Key Agreement failed"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Timeout during key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Key agreement was aborted"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Key agreement is already started"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Key agreement cannot be started with yourself"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "The remote user is not present in the network any more"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -10371,8 +7737,6 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10383,99 +7747,40 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Key Agreement Request"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM With Password"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Cannot set IM key"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Set IM Password"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "User Information"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "The %s buddy is not trusted"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -10484,19 +7789,13 @@
 "You can use the Get Public Key command to get the public key."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "The %s buddy is not present in the network"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10504,18 +7803,12 @@
 "To add the buddy you must import their public key. Press Import to import a "
 "public key."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Select correct user"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10523,8 +7816,6 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10532,313 +7823,153 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Detached"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Happy"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Sad"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Angry"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "In Love"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Bored"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excited"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "User Modes"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Device"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Kill User"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Draw On Whiteboard"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -10853,445 +7984,245 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Group name"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:743
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Invite List"
 
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:1045
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Call Command"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Secure File Transfer"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Error during file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Remote disconnected"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Key agreement failed"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Connection timed out"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Connection creation failed"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "File transfer session does not exist"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "No file transfer session active"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "File transfer already started"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Could not perform key agreement for file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Could not start the file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Error occurred"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s has changed the topic of <I>%s</I> to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Date of Birth"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Job Role"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unit"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Real Name"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Status Text"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_More..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Room List"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: ../libpurple/protocols/silc/ops.c:1468
 msgid "Network is empty"
 msgstr "Network is empty"
 
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11326,59 +8257,36 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: ../libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
 msgstr "WATCH"
 
-#: ../libpurple/protocols/silc/ops.c:1648
 msgid "Cannot watch user"
 msgstr "Cannot watch user"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -11387,12 +8295,10 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Received %s's public key. Would you like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11405,101 +8311,64 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verify Public Key"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_View..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Connecting to SILC Server"
-
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+msgid "Unable to create connection"
+msgstr "Unable to create connection"
+
 msgid "Could not load SILC key pair"
 msgstr "Could not load SILC key pair"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr "Unable to create connection"
-
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Connecting to SILC Server"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Cannot initialise SILC protocol"
 
-#: ../libpurple/protocols/silc/silc.c:445
 msgid "Error loading SILC key pair"
 msgstr "Error loading SILC key pair"
 
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "In love"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11507,63 +8376,36 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Video conferencing"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online Services"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Your vCard File"
 
-#: ../libpurple/protocols/silc/silc.c:812
 msgid "Timezone (UTC)"
 msgstr "Timezone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11573,213 +8415,124 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Create New SILC Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Passphrases do not match"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Key Pair Generation failed"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Key length"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Public key file"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Private key file"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Passphrase (retype)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generate Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Online Status"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Create SILC key pair..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unknown command: %s, (may be a client bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11787,8 +8540,6 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11796,18 +8547,12 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11815,43 +8560,27 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11868,141 +8597,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plug-in"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "Network"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Public Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Private Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Use Perfect Forward Secrecy"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Block messages to whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Automatically open whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Digitally sign and verify all messages"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
 msgid "Cannot create SILC key pair\n"
 msgstr "Cannot create SILC key pair\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Real Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Host Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Country: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Key Length: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Version: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12013,8 +8692,6 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12023,44 +8700,28 @@
 "Public Key Babbleprint:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Public Key Information"
 
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Paging"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s sent message to whiteboard. Would you like to open the whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12069,114 +8730,82 @@
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
-#: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "No name"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Cannot find/access ~/.silc directory"
-
-#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Could not load SILC key pair: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Could not write"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
 msgid "Unknown server response."
-msgstr "Unknown reason."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+msgstr "Unknown server response."
+
 msgid "Could not create listen socket"
 msgstr "Could not create listen socket"
 
-#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "Couldn't resolve host"
 
-#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "Could not resolve hostname"
 
-#: ../libpurple/protocols/simple/simple.c:1694
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "SIP screen names may not contain whitespaces or @ symbols"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "SIP usernames may not contain whitespaces or @ symbols"
 
 #. *< type
 #. *< ui_requirement
@@ -12186,170 +8815,135 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE Protocol Plug-in"
 
-#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publish status (note: anyone can watch you)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Use UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "Use proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "Auth User"
 
-#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: ../libpurple/protocols/toc/toc.c:503
 #, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "A message has been dropped, you are exceeding the server speed limit."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "You are sending messages too fast to %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "You missed an IM from %s because it was too big."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "You missed an IM from %s because it was sent too fast."
 
-#: ../libpurple/protocols/toc/toc.c:518
 #, c-format
 msgid "Failure."
 msgstr "Failure."
 
-#: ../libpurple/protocols/toc/toc.c:521
 #, c-format
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: ../libpurple/protocols/toc/toc.c:524
 #, c-format
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: ../libpurple/protocols/toc/toc.c:527
 #, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: ../libpurple/protocols/toc/toc.c:530
 #, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-mail lookup restricted."
 
-#: ../libpurple/protocols/toc/toc.c:533
 #, c-format
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: ../libpurple/protocols/toc/toc.c:536
 #, c-format
 msgid "No keywords."
 msgstr "No keywords."
 
-#: ../libpurple/protocols/toc/toc.c:539
 #, c-format
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: ../libpurple/protocols/toc/toc.c:543
 #, c-format
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
-#, c-format
-msgid "Incorrect screen name or password."
-msgstr "Incorrect screen name or password."
-
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
+msgid "Incorrect username or password."
+msgstr "Incorrect username or password."
+
 #, c-format
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: ../libpurple/protocols/toc/toc.c:555
 #, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Your warning level is currently too high to log in."
 
-#: ../libpurple/protocols/toc/toc.c:558
 #, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
@@ -12358,79 +8952,60 @@
 "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."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "An unknown error, %d, has occurred.  Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC has come back from its pause. You may now send messages again."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -12445,29 +9020,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s has sent you a webcam invitation, which is not yet supported."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "Authorisation denied message:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12476,16 +9045,13 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12496,11 +9062,9 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12509,48 +9073,33 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked, please log in to the Yahoo! website."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "Received unexpected HTTP response from server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12559,7 +9108,6 @@
 "Lost connection with %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12568,112 +9116,72 @@
 "Could not establish a connection with %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "Not at Home"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "Not at Desk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "Not in Office"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Appear Online"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "Presence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "Presence Settings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
 msgstr "Activate which ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr "Open Inbox"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "Buzz"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Buzzing %s..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  List rooms on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -12687,86 +9195,67 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "Japan Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Pager port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "File transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "Japan file transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "Chat room locale"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "Chat room list URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chat port"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Sent Doodle request."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s is trying to send you a group of %d files.\n"
+
 msgid "Write Error"
 msgstr "Write Error"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -12774,7 +9263,6 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -12782,47 +9270,34 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Latest News"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Last Update"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12830,7 +9305,6 @@
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12838,7 +9312,6 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12848,39 +9321,31 @@
 "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."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Unknown room"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Perhaps the room is full"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Not available"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -12888,46 +9353,34 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Voices"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -12936,7 +9389,6 @@
 "Lost connection with server\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12944,75 +9396,56 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Unable to send to chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Hidden or not logged-in"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Class:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Attempt to subscribe to %s,%s,%s failed"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13020,7 +9453,6 @@
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13028,7 +9460,6 @@
 "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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13036,15 +9467,12 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -13058,45 +9486,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plug-in"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Use tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc command"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Import from .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Import from .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13105,76 +9521,61 @@
 "Unable to create socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Unable to parse response from HTTP proxy: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP proxy connection error %d"
 
-#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
 
-#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr "Could not resolve host name"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "_Accept"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "I'm not here right now"
 
-#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "saved statuses"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Requesting %s's attention..."
 
-#: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s has requested your attention!"
 
-#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13183,93 +9584,76 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "SSL Connection Failed"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL peer presented an invalid certificate"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Unknown SSL error"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Unset"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libpurple/status.c:609
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s changed status from %s to %s"
-
-#: ../libpurple/status.c:619
-#, c-format
-msgid "%s is now %s"
-msgstr "%s is now %s"
-
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s is no longer %s"
-
-#: ../libpurple/status.c:1234
+msgid "Listening to music"
+msgstr "Listening to music"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) changed status from %s to %s"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) is now %s"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) is no longer %s"
+
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s became idle"
 
-#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is no longer idle"
 
-#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error reading %s"
 
-#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13278,67 +9662,56 @@
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 
-#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Unknown."
 
-#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hour"
 msgstr[1] "%s, %d hours"
 
-#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Could not open %s: Redirected too many times"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Unable to connect to %s"
 
-#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13347,107 +9720,111 @@
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 
-#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error reading from %s: %s"
 
-#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error writing to %s: %s"
 
-#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s: %s"
 
-#: ../pidgin.desktop.in.h:1
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Connection interrupted by other software on your computer."
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Remote host closed connection."
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr "Connection timed out."
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr "Connection refused."
+
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Send instant messages over multiple protocols"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:439
-msgid "Screen _name:"
-msgstr "Screen _name:"
-
-#: ../pidgin/gtkaccount.c:529
-msgid "_Local alias:"
-msgstr "_Local alias:"
-
-#: ../pidgin/gtkaccount.c:533
+msgid "_Username:"
+msgstr "_Username:"
+
 msgid "Remember pass_word"
 msgstr "Remember pass_word"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "User Options"
 
-#: ../pidgin/gtkaccount.c:604
+msgid "_Local alias:"
+msgstr "_Local alias:"
+
 msgid "New _mail notifications"
 msgstr "New _mail notifications"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Use this buddy _icon for this account:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
-#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Use GNOME Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -13456,72 +9833,52 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "_Username:"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1195
 msgid "Unable to save new account"
 msgstr "Unable to save new account"
 
-#: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
 msgstr "An account already exists with the specified criteria."
 
-#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../pidgin/gtkaccount.c:1499
 msgid "Create this new account on the server"
 msgstr "Create this new account on the server"
 
-#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13544,11 +9901,29 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Join a Chat"
-
-#: ../pidgin/gtkblist.c:788
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "You have %d contact named %s. Would you like to merge them?"
+msgstr[1] ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+
+msgid "Please update the necessary fields."
+msgstr "Please update the necessary fields."
+
+msgid "Room _List"
+msgstr "Room _List"
+
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13556,424 +9931,371 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Block"
 
-#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "Un_block"
 
-#: ../pidgin/gtkblist.c:1139
+msgid "Move to"
+msgstr "Move to"
+
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Send File"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Add Buddy _Pounce"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+msgid "_Send File..."
+msgstr "_Send File..."
+
+msgid "Add Buddy _Pounce..."
+msgstr "Add Buddy _Pounce..."
+
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+msgid "Hide when offline"
+msgstr "Hide when offline"
+
+msgid "Show when offline"
+msgstr "Show when offline"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Add a _Buddy"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Add a C_hat"
-
-#: ../pidgin/gtkblist.c:1244
+msgid "Add _Buddy..."
+msgstr "Add _Buddy"
+
+msgid "Add C_hat..."
+msgstr "Add C_hat"
+
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+msgid "Persistent"
+msgstr "Persistent"
+
+msgid "_Edit Settings..."
+msgstr "_Edit Settings..."
+
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr "Unknown node type"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/Buddies/Show"
-
-#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Sh_ow"
+msgstr "/Buddies/Sh_ow"
+
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Buddies/Show/_Offline Buddies"
 
-#: ../pidgin/gtkblist.c:2877
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Buddies/Show/_Empty Groups"
 
-#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Buddies/Show/Buddy _Details"
 
-#: ../pidgin/gtkblist.c:2879
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Buddies/Show/Idle _Times"
 
-#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Buddies/Show/_Protocol Icons"
 
-#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddies/_Sort Buddies"
 
-#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Accounts/Add\\/Edit"
+msgid "/Accounts/Manage"
+msgstr "/Accounts/Manage"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tools/Buddy _Pounces"
 
-#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/_Certificates"
 msgstr "/Tools/_Certificates"
 
-#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
-#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/Tools/System _Log"
 
-#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../pidgin/gtkblist.c:2942
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Account:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Occupants:</b> %d"
+
 #, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>Account:</b> %s"
-
-#: ../pidgin/gtkblist.c:3020
+"<b>Topic:</b> %s"
+
+msgid "(no topic set)"
+msgstr "(no topic set)"
+
 msgid "Buddy Alias"
 msgstr "Buddy Alias"
 
-#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "Logged In"
 
-#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "Last Seen"
 
-#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr "Spooky"
 
-#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr "Awesome"
 
-#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr "Rockin'"
 
-#: ../pidgin/gtkblist.c:3453
+msgid "Total Buddies"
+msgstr "Total Buddies"
+
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Idle %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Idle %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "Idle %dm"
 
-#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddies/New Instant Message..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddies/Get User Info..."
 
-#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddies/Add Buddy..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddies/Add Chat..."
 
-#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Buddies/Add Group..."
 
-#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d unread messages from %s\n"
 
-#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Manually"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alphabetically"
-
-#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "By status"
 
-#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "By log size"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s disconnected"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s disconnected: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+#, c-format
+msgid "%s disabled"
+msgstr "%s disabled"
+
+msgid "Reconnect"
+msgstr "Reconnect"
+
+msgid "Re-enable"
+msgstr "Re-enable"
+
+msgid "Welcome back!"
+msgstr "Welcome back!"
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"%d account was disabled because you signed on from another location:"
+msgstr[1] ""
+"%d accounts were disabled because you signed on from another location:"
+
 msgid "<b>Username:</b>"
 msgstr "<b>Username:</b>"
 
-#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Buddies/Show/Offline Buddies"
 
-#: ../pidgin/gtkblist.c:4600
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Buddies/Show/ Empty Groups"
 
-#: ../pidgin/gtkblist.c:4606
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddies/Show/Buddy Details"
 
-#: ../pidgin/gtkblist.c:4609
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Buddies/Show/Idle Times"
 
-#: ../pidgin/gtkblist.c:4612
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Buddies/Show/Protocol Icons"
 
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:5542
-msgid "_Screen name:"
-msgstr "_Screen name:"
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-msgid "A_lias:"
-msgstr "A_lias:"
-
-#: ../pidgin/gtkblist.c:5826
+msgid "Add a buddy.\n"
+msgstr "Add a buddy.\n"
+
+msgid "Buddy's _username:"
+msgstr "Buddy _username:"
+
+msgid "(Optional) A_lias:"
+msgstr "(Optional) A_lias:"
+
+msgid "Add buddy to _group:"
+msgstr "Add buddy to _group:"
+
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -13981,7 +10303,6 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -13989,80 +10310,61 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: ../pidgin/gtkblist.c:5964
+msgid "A_lias:"
+msgstr "A_lias:"
+
+msgid "Auto_join when account becomes online."
+msgstr "Auto_join when account becomes online."
+
+msgid "_Hide chat when the window is closed."
+msgstr "_Hide chat when the window is closed."
+
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Accounts/"
 
-#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "No actions available"
 
-#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Enable Account"
 
-#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Accounts/Enable Account"
 
-#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Tools"
 
-#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
 msgid "SSL Servers"
 msgstr "SSL Servers"
 
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-
-#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "That buddy is not on the same protocol as this chat."
 
-#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "You are not currently signed on with an account that can invite that buddy."
 
-#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14070,188 +10372,141 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Message:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Unable to open file."
-
-#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Find"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "Last said"
 
-#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animate"
 
-#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "Set Custom Icon..."
 
-#: ../pidgin/gtkconv.c:2734
+msgid "Change Size"
+msgstr "Change Size"
+
 msgid "Remove Custom Icon"
 msgstr "Remove Custom Icon"
 
-#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr "Show All"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
-#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/M_ore"
 
-#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/_Unblock..."
 
-#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbars"
 
-#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/Conversation/More"
 
-#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr "/Options"
 
@@ -14260,589 +10515,432 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Unblock..."
 
-#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbars"
 
-#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: ../pidgin/gtkconv.c:3391
-msgid "User has typed something and stopped"
-msgstr "User has typed something and stopped"
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s has stopped typing"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Send To"
-
-#: ../pidgin/gtkconv.c:4286
+msgid "S_end To"
+msgstr "S_end To"
+
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Typing"
 
-#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "Stopped Typing"
 
-#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "New Event"
 
-#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Clears all conversation scrollbacks."
 
-#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Confirm close"
 
-#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "You have unread messages. Are you sure you want to close the window?"
 
-#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "Close other tabs"
 
-#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "Close all tabs"
 
-#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "Detach this tab"
 
-#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "Close this tab"
 
-#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Last created window"
 
-#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "New window"
 
-#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "By group"
 
-#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "By account"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Invert"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Highlight matches"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "_Icon Only"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Both Icon & Text"
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Right click for more options."
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Level "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Select the debug filter level."
 
-#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "All"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Misc"
 
-#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Warning"
 
-#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Fatal Error"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "lead developer"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "developer"
 
-#: ../pidgin/gtkdialogs.c:87
 msgid "support"
 msgstr "support"
 
-#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
 msgstr "Senior Contributor/QA"
 
-#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim maintainer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP developer"
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "original author"
 
-#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+msgstr "Belarusian Latin"
+
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valencian Catalan"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Czech"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danish"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "German"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Greek"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Australian English"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "British English"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
 msgstr "Estonian"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Euskera (Basque)"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persian"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "French"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galician"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Gujarati Language Team"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italian"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Georgian"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgian Translators"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Kannada Translation team"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Korean"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurdish"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leo"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+msgstr "Lao"
+
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Dutch, Flemish"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Norwegian Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+msgid "Punjabi"
+msgstr "Punjabi"
+
 msgid "Polish"
 msgstr "Polish"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Russian"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albanian"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+msgid "Sinhala"
+msgstr "Sinhala"
+
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../pidgin/gtkdialogs.c:213
+msgid "Urdu"
+msgstr "Urdu"
+
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinese"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr "About %s"
 
-#: ../pidgin/gtkdialogs.c:400
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14865,93 +10963,72 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
 #, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr "Current Developers"
 
-#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: ../pidgin/gtkdialogs.c:468
 msgid "Retired Crazy Patch Writers"
 msgstr "Retired Crazy Patch Writers"
 
-#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr "Artists"
 
-#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "Debugging Information"
 
-#: ../pidgin/gtkdialogs.c:906
+msgid "_Name"
+msgstr "_Name"
+
+msgid "_Account"
+msgstr "_Account"
+
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-
-#: ../pidgin/gtkdialogs.c:998
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+
 msgid "View User Log"
 msgstr "View User Log"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-
-#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: ../pidgin/gtkdialogs.c:1106
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14966,15 +11043,12 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr "_Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1148
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -14983,15 +11057,12 @@
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr "Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr "_Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1208
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15000,30 +11071,24 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr "_Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15032,166 +11097,169 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr "_Remove Chat"
 
-#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "Right-click for more unread messages...\n"
 
-#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Change Status"
 
-#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Show Buddy List"
 
-#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "New Message..."
 
-#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "Blink on new message"
-
-#: ../pidgin/gtkdocklet.c:542
+msgid "Blink on New Message"
+msgstr "Blink on New Message"
+
 msgid "Quit"
 msgstr "Quit"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Not started"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Receiving As:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error launching %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Error running %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Process returned error code %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Filename:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Local File:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "Close this window when all transfers _finish"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "C_lear finished transfers"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "File transfer _details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Resume"
 
-#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Paste as Plain _Text"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "_Reset formatting"
 
-#: ../pidgin/gtkimhtml.c:1373
+msgid "Disable _smileys in selected text"
+msgstr "Disable _smileys in selected text"
+
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
 
-#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
-#: ../pidgin/gtkimhtml.c:1598
+msgid "Sent Message Name Color"
+msgstr "Sent Message Name Colour"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "Color to draw the name of a message you sent."
+
+msgid "Received Message Name Color"
+msgstr "Received Message Name Colour"
+
+msgid "Color to draw the name of a message you received."
+msgstr "Colour to draw the name of a message you received."
+
+msgid "\"Attention\" Name Color"
+msgstr "\"Attention\" Name Colour"
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+"Colour to draw the name of a message you received containing your name."
+
+msgid "Action Message Name Color"
+msgstr "Action Message Name Colour"
+
+msgid "Color to draw the name of an action message."
+msgstr "Colour to draw the name of an action message."
+
+msgid "Typing notification color"
+msgstr "Typing notification colour"
+
+msgid "The color to use for the typing notification font"
+msgstr "The colour to use for the typing notification font"
+
+msgid "Typing notification font"
+msgstr "Typing notification font"
+
+msgid "The font to use for the typing notification"
+msgstr "The font to use for the typing notification"
+
+msgid "Enable typing notification"
+msgstr "Enable typing notification"
+
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15201,7 +11269,6 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15211,7 +11278,6 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15222,7 +11288,6 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15233,36 +11298,28 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../pidgin/gtkimhtml.c:3522
 #, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Select Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15270,156 +11327,124 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+msgid "Smile!"
+msgstr "Smile!"
+
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "Smile!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Group Items"
 msgstr "Group Items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr "Ungroup Items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Bold"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Italic"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Underline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
 msgstr "Increase Font Size"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
 msgstr "Decrease Font Size"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr "Font Face"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Background Color"
 msgstr "Background Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Reset Formatting"
 msgstr "Reset Formatting"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert IM Image"
 msgstr "Insert IM Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr "<b>_Bold</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<i>_Italic</i>"
 msgstr "<i>_Italic</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<u>_Underline</u>"
 msgstr "<u>_Underline</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Strikethrough</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Larger</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Smaller</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr "_Font face"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Foreground _color"
 msgstr "Foreground _colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr "Bac_kground colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr "_Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr "_Horizontal rule"
 
-#: ../pidgin/gtklog.c:293
+msgid "_Smile!"
+msgstr "_Smile!"
+
+msgid "Log Deletion Failed"
+msgstr "Log Deletion Failed"
+
+msgid "Check permissions and try again."
+msgstr "Check permissions and try again."
+
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15428,7 +11453,6 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15437,7 +11461,6 @@
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 
-#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -15446,76 +11469,29 @@
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 
-#: ../pidgin/gtklog.c:453
+msgid "Delete Log?"
+msgstr "Delete Log?"
+
+msgid "Delete Log..."
+msgstr "Delete Log..."
+
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "No logs were found"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "_Browse logs folder"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Total log size:"
-
-#: ../pidgin/gtklog.c:709
-#, c-format
-msgid "Conversations in %s"
-msgstr "Conversations in %s"
-
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversations with %s"
-
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "System Log"
-
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Try `%s -h' for more information.\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15525,8 +11501,10 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15537,14 +11515,43 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15562,7 +11569,7 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15582,206 +11589,167 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Open All Messages"
 
-#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>You have %d new e-mail.</b>"
-msgstr[1] "<b>You have %d new e-mails.</b>"
-
-#: ../pidgin/gtknotify.c:989
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d new e-mail.</b>"
+msgstr[1] "<b>%d new e-mails.</b>"
+
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "The following plug-ins will be unloaded."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Multiple plug-ins will be unloaded."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Unload Plug-ins"
 
-#: ../pidgin/gtkplugin.c:400
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t%s"
-
-#: ../pidgin/gtkplugin.c:410
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+msgid "Could not unload plugin"
+msgstr "Could not unload plugin"
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plug-in website for an update.</span>"
-
-#: ../pidgin/gtkplugin.c:536
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+
+msgid "Author"
+msgstr "Author"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Written by:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Web site:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Filename:</b>"
+
 msgid "Configure Pl_ugin"
 msgstr "Configure Pl_ug-in"
 
-#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plug-in Details</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Select a file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
-#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
-#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "Si_gns on"
 
-#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "Signs o_ff"
 
-#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "Goes a_way"
 
-#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "Ret_urn from away"
 
-#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "Becomes _idle"
 
-#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "Is no longer i_dle"
 
-#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "Starts _typing"
 
-#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "P_auses while typing"
 
-#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "Stops t_yping"
 
-#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "Sends a _message"
 
-#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "Ope_n a message window"
 
-#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "_Pop up a notification"
 
-#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "Brows_e..."
 
-#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "Br_owse..."
 
-#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
 msgstr "P_ounce only when my status is not Available"
 
-#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "_Recurring"
 
-#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Default"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley theme failed to unpack."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Install Theme"
 
-#: ../pidgin/gtkprefs.c:697
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -15789,132 +11757,112 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Icon"
 
-#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Cl_ose conversations with the Escape key"
+
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "_Show system tray icon:"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "On unread messages"
 
-#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Conversation Window Hiding"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "When away"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Placement"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Top"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Left"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Right"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Left Vertical"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Right Vertical"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "N_ew conversations:"
 
-#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "Show _formatting on incoming messages"
 
-#: ../pidgin/gtkprefs.c:998
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Close IMs immediately when the tab is closed"
+
 msgid "Show _detailed information"
 msgstr "Show _detailed information"
 
-#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "Highlight _misspelled words"
 
-#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "Use smooth-scrolling"
 
-#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr "F_lash window when IMs are received"
 
-#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_ze new conversation windows"
 
-#: ../pidgin/gtkprefs.c:1023
+msgid "Minimum input area height in lines:"
+msgstr "Minimum input area height in lines:"
+
 msgid "Font"
 msgstr "Font"
 
-#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
 msgstr "Use document font from _theme"
 
-#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
 msgstr "Use font from _theme"
 
-#: ../pidgin/gtkprefs.c:1029
 msgid "Conversation _font:"
 msgstr "Conversation _font:"
 
-#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15922,119 +11870,124 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 
-#: ../pidgin/gtkprefs.c:1128
+msgid "Cannot start proxy configuration program."
+msgstr "Cannot start proxy configuration program."
+
+msgid "Cannot start browser configuration program."
+msgstr "Cannot start browser configuration program."
+
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "_Autodetect IP address"
 
-#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1185
+msgid "_Enable automatic router port forwarding"
+msgstr "_Enable automatic router port forwarding"
+
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "_Start port:"
 
-#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "_End port:"
 
-#: ../pidgin/gtkprefs.c:1203
+msgid "Proxy Server &amp; Browser"
+msgstr "Proxy Server &amp; Browser"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Proxy configuration program was not found.</b>"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Browser configuration program was not found.</b>"
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+
+msgid "Configure _Proxy"
+msgstr "Configure _Proxy"
+
+msgid "Configure _Browser"
+msgstr "Configure _Browser"
+
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "No proxy"
 
-#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_User:"
 
-#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+msgid "Desktop Default"
+msgstr "Desktop Default"
+
 msgid "GNOME Default"
 msgstr "GNOME Default"
 
-#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Browser default"
 
-#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Existing window"
 
-#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "New tab"
 
-#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16043,69 +11996,54 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "Log _format:"
 
-#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr "Log all _instant messages"
 
-#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Log all _status changes to system log"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: ../pidgin/gtkprefs.c:1635
 #, c-format
 msgid "Quietest"
 msgstr "Quietest"
 
-#: ../pidgin/gtkprefs.c:1637
 #, c-format
 msgid "Quieter"
 msgstr "Quieter"
 
-#: ../pidgin/gtkprefs.c:1639
 #, c-format
 msgid "Quiet"
 msgstr "Quiet"
 
-#: ../pidgin/gtkprefs.c:1643
 #, c-format
 msgid "Loud"
 msgstr "Loud"
 
-#: ../pidgin/gtkprefs.c:1645
 #, c-format
 msgid "Louder"
 msgstr "Louder"
 
-#: ../pidgin/gtkprefs.c:1647
 #, c-format
 msgid "Loudest"
 msgstr "Loudest"
 
-#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Console beep"
 
-#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "No sounds"
 
-#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16114,267 +12052,213 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "Enable sounds:"
 
-#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Play"
 
-#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
 
-#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "When both away and idle"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "Change status when _idle"
 
-#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before becoming idle:"
 
-#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "Status at Startup"
 
-#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "Use status from last _exit at startup"
 
-#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "Status to a_pply at startup:"
 
-#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "Status / Idle"
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Allow only the users below"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Block all users"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "Remove Al_l"
+
 msgid "Permit User"
 msgstr "Permit User"
 
-#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permit"
 
-#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Block User"
 
-#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
 
-#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Apply"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Choose New Name"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Select Folder..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Room List"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Get List"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Add Chat"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Are you sure you want to delete the selected saved statuses?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Use"
 
-#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Title already in use.  You must choose a unique title."
 
-#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "Different"
 
-#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Use a _different status for some accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "Waiting for network connection"
 
-#: ../pidgin/gtkutils.c:632
+msgid "New status..."
+msgstr "New status..."
+
+msgid "Saved statuses..."
+msgstr "Saved statuses..."
+
+msgid "Status Selector"
+msgstr "Status Selector"
+
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16383,12 +12267,9 @@
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16396,23 +12277,18 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Send image file"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Would you like to set it as the buddy icon for this user?"
 
-#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16420,7 +12296,6 @@
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 
-#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16433,11 +12308,9 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16445,7 +12318,6 @@
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 
-#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16456,108 +12328,83 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "The file '%s' is too large for %s.  Please try a smaller image.\n"
 
-#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "Icon Error"
 
-#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "Could not set icon"
 
-#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Failed to load image \"%s\": reason not known; probably a corrupt image file"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Save File"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Select colour"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Close _tabs"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Get Info"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invite"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modify"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin Tooltip"
+msgstr "Pidgin Tooltip"
+
 msgid "Pidgin smileys"
 msgstr "Pidgin smileys"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selecting this disables graphical emoticons."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "none"
 
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "Display Statistics"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Responses Probability:"
 
-#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistics Configuration"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Maximum response timeout:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutes"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Maximum last-seen difference:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Threshold:"
 
@@ -16567,51 +12414,37 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Contact Availability Prediction"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Contact Availability Prediction plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-
-#: ../pidgin/plugins/contact_priority.c:61
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Displays statistical information about your buddies' availability"
+
 msgid "Buddy is idle"
 msgstr "Buddy is idle"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Buddy is away"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Buddy is away for an extended period"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Buddy is mobile"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Buddy is offline"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Point values to use when..."
 
-#: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
@@ -16619,11 +12452,9 @@
 "The buddy with the <i>highest score</i> is the buddy who will have priority "
 "in the contact.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Use last buddy when scores are equal"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Point values to use for account..."
 
@@ -16633,21 +12464,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Contact Priority"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Allows for controlling the values associated with different buddy states."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -16655,61 +12483,47 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Conversation Colours"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Customise colours in the conversation window"
 
-#: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr "Error Messages"
 
-#: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "Highlighted Messages"
 
-#: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr "System Messages"
 
-#: ../pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr "Sent Messages"
 
-#: ../pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr "Received Messages"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Select Colour for %s"
 
-#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignore incoming format"
 
-#: ../pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr "Apply in Chats"
 
-#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr "Apply in IMs"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "By conversation count"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
@@ -16717,11 +12531,9 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separate IM and Chat windows when placing by number"
 
@@ -16731,19 +12543,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -16752,20 +12561,16 @@
 "and Chats"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Mouse Gestures Configuration"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Middle mouse button"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Right mouse button"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Visual gesture display"
 
@@ -16775,62 +12580,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Select a person from your address book below, or add a new person."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -16839,43 +12630,33 @@
 "person."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "User _details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "Unable to send e-mail"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "The evolution executable was not found in the PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "An e-mail address was not found for this buddy."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Send E-Mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
@@ -16885,7 +12666,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -16893,37 +12673,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Provides integration with Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Please enter the buddy's screen name and account type below."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
+msgid "Please enter the buddy's username and account type below."
+msgstr "Please enter the buddy's username and account type below."
+
 msgid "Account type:"
 msgstr "Account type:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Optional information:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Forename"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Surname"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -16933,7 +12704,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK Signals Test"
 
@@ -16941,12 +12711,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "Test to see that all UI signals are working properly."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -16955,7 +12722,6 @@
 "\n"
 "<b>Buddy Note</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "History"
 
@@ -16965,7 +12731,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Iconify on Away"
 
@@ -16973,43 +12738,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Mail Checker"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Checks for new local mail."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markerline"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Draw a line to indicate new messages in a conversation."
 
-#: ../pidgin/plugins/markerline.c:246
+msgid "Jump to markerline"
+msgstr "Jump to markerline"
+
 msgid "Draw Markerline in "
 msgstr "Draw Markerline in "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17017,36 +12775,28 @@
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Music messaging session confirmed."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Music Messaging"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "There was a conflict in running the command:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Error Running Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "The following error has occurred:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Music Messaging Configuration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Score Editor Path"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -17058,12 +12808,10 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging Plugin for collaborative composition."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -17072,74 +12820,63 @@
 "on a piece of music by editting a common score in real-time."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notify For"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Only when someone says your screen name"
-
-#: ../pidgin/plugins/notify.c:707
+msgid "\t_Only when someone says your username"
+msgstr "\t_Only when someone says your username"
+
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insert c_ount of new messages into window title"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Insert count of new messages into _X property"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "R_aise conversation window"
 
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "_Present conversation window"
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -17149,7 +12886,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -17157,7 +12893,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -17167,19 +12902,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin Demonstration Plug-in"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "An example plug-in that does stuff - see the description."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -17191,61 +12923,44 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cursor Colour"
 
-#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Secondary Cursor Colour"
 
-#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Hyperlink Colour"
 
-#: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Highlighted Messages Name Colour"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
-#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Conversation Entry"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Conversation History"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Log Viewer"
-
-#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Request Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Notify Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Select Colour"
 
-#: ../pidgin/plugins/pidginrc.c:300
 #, c-format
 msgid "Select Interface Font"
 msgstr "Select Interface Font"
 
-#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Select Font for %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Interface Font"
 
-#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut Theme"
 
@@ -17269,48 +12984,37 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Interface colours"
 
-#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget Sizes"
 
-#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc File Tools"
 
-#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Write settings to %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Re-read gtkrc files"
 
-#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Theme Control"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Provides access to commonly used gtkrc settings."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Lets you send raw input to text-based protocols."
 
-#: ../pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -17318,7 +13022,6 @@
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -17327,12 +13030,10 @@
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>ChangeLog:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "New Version Available"
 
@@ -17342,19 +13043,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Release Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Checks periodically for new releases."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -17362,68 +13060,76 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 
-#: ../pidgin/plugins/spellchk.c:1962
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Send Button"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr "Conversation Window Send Button."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+
 msgid "Duplicate Correction"
 msgstr "Duplicate Correction"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "The specified word already exists in the correction list."
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "You type"
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "You send"
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Whole words only"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "You _type:"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "You _send:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Exact case match (uncheck for automatic case handling)"
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Only replace _whole words"
 
-#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "General Text Replacement Options"
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Enable replacement of last word on send"
 
-#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -17433,7 +13139,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -17441,11 +13146,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Display Timestamps Every"
 
@@ -17455,50 +13158,38 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Timestamp"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Display iChat-style timestamps"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Display iChat-style timestamps every N minutes."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Timestamp Format Options"
 
-#: ../pidgin/plugins/timestamp_format.c:26
 #, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Force 24-hour time format"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Show dates in..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversations"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "For delayed messages"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "For delayed messages and in chats"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "_Message Logs:"
 
@@ -17508,19 +13199,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Message Timestamp Formats"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Customises the message timestamp formats."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -17528,44 +13216,32 @@
 "This plug-in allows the user to customize conversation and logging message "
 "timestamp formats."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Remove IM window transparency on focus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Always on top"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Remove Buddy List window transparency on focus"
 
@@ -17575,19 +13251,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -17599,53 +13272,42 @@
 "\n"
 "* Note: This plug-in requires Win2000 or greater."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Startup"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s on Windows startup"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Keep Buddy List window on top:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Only when docked"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Flash window when chat messages are received"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin Options"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Pidgin for Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 
-#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Logged out.</font>"
 
@@ -17655,151 +13317,30 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP Console"
 
-#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Account: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Not connected to XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Insert an <iq/> stanza."
 
-#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Insert a <presence/> stanza."
 
-#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Insert a <message/> stanza."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Send and receive raw XMPP stanzas."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
-
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Show All"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Show offline buddies"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "By status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "By log size"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Select Notes Address Book"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Current token"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protocol Plug-in"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Failure: Authentication failed"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s sent you a message"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Unknown error"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s changed status from %s to %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s is now %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s is no longer %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Message:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Send File"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Add Buddy Pounce..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Not allowed when offline"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Not allowed when offline"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Add Buddy"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Add Chat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persian"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Accounts"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Send To"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Smile!"