diff po/en_GB.po @ 14948:75be19bff851

[gaim-migrate @ 17719] Some updated translations committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 10 Nov 2006 06:23:10 +0000
parents 98e65e6a5c32
children 8e3734ea23ba
line wrap: on
line diff
--- a/po/en_GB.po	Fri Nov 10 05:18:10 2006 +0000
+++ b/po/en_GB.po	Fri Nov 10 06:23:10 2006 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-07 12:33+0000\n"
+"POT-Creation-Date: 2006-11-06 12:17+0000\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -28,766 +28,1053 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Send instant messages over multiple protocols"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Cipher Test"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Tests the ciphers that ship with gaim."
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Buddy is idle"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Buddy is away"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Buddy is away for an extended period"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Buddy is mobile"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Buddy is offline"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Point values to use when..."
-
-#: ../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"
-msgstr ""
-"The buddy with the <i>highest score</i> is the buddy who will have priority "
-"in the contact.\n"
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Use last buddy when scores are equal"
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Point values to use for account..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Contact Priority"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Allows for controlling the values associated with different buddy states."
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Plug-in to establish a Crazychat session."
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "Uses Gaim to obtain buddy IPs to connect for a Crazychat session"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Network Configuration"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP port"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP port"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Feature Calibration"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Disabled"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:135
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
-msgid "DBus Plugin Example"
-msgstr "DBus Plug-in Example"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Right-click for more unread messages...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239
-#, 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"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Change Status"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
-msgid "Available"
-msgstr "Available"
-
-#. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Away"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "Offline"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
+#: ../console/gntaccount.c:119 ../console/gntblist.c:277
+#: ../console/gntblist.c:395 ../console/gntblist.c:408
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1188
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1449
+msgid "Error"
+msgstr "Error"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Account was not added"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Screen name of an account must not be empty."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "New mail notifications"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Remember password"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+msgid "Modify Account"
+msgstr "Modify Account"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "New Account"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protocol:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Screen name:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Password:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+msgid "Alias:"
+msgstr "Alias:"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:318
+#: ../console/gntblist.c:385 ../console/gntblist.c:418
+#: ../console/gntblist.c:747 ../console/gntblist.c:916
+#: ../console/gntblist.c:1007 ../console/gntblist.c:1920
+#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
+#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
+#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
+#: ../gtk/gtkdialogs.c:681 ../gtk/gtkdialogs.c:818 ../gtk/gtkdialogs.c:909
+#: ../gtk/gtkdialogs.c:928 ../gtk/gtkdialogs.c:950 ../gtk/gtkdialogs.c:970
+#: ../gtk/gtkdialogs.c:1014 ../gtk/gtkdialogs.c:1052 ../gtk/gtkdialogs.c:1106
+#: ../gtk/gtkdialogs.c:1143 ../gtk/gtkdialogs.c:1168
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
+#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:964
+#: ../libgaim/account.c:1135 ../libgaim/account.c:1169
+#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:850
+#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1389
+#: ../libgaim/protocols/oscar/oscar.c:2153
+#: ../libgaim/protocols/oscar/oscar.c:2192
+#: ../libgaim/protocols/oscar/oscar.c:2240
+#: ../libgaim/protocols/oscar/oscar.c:5734
+#: ../libgaim/protocols/oscar/oscar.c:5786
+#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libgaim/protocols/oscar/oscar.c:5963
+#: ../libgaim/protocols/oscar/oscar.c:6019
+#: ../libgaim/protocols/oscar/oscar.c:6088
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3446
+#: ../libgaim/protocols/sametime/sametime.c:3616
+#: ../libgaim/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libgaim/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Save"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Are you sure you want to delete %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Delete Account"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Delete"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1841
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+msgid "Accounts"
+msgstr "Accounts"
+
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "You can enable/disable accounts from the following list."
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:318 ../console/gntblist.c:385
+#: ../console/gntblist.c:418 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383
+#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2431
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Add"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Modify"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#, 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"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+msgid "Add buddy to your list?"
+msgstr "Add buddy to your list?"
+
+#: ../console/gntblist.c:269
+msgid "You must provide a screename for the buddy."
+msgstr "You must provide a screen name for the buddy."
+
+#: ../console/gntblist.c:271
+msgid "You must provide a group."
+msgstr "You must provide a group."
+
+#: ../console/gntblist.c:273
+msgid "You must select an account."
+msgstr "You must select an account."
+
+#: ../console/gntblist.c:277
+msgid "Error adding buddy"
+msgstr "Error adding buddy"
+
+#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+msgid "Screen Name"
+msgstr "Screen Name"
+
+#: ../console/gntblist.c:305 ../console/gntblist.c:377 ../gtk/gtkdialogs.c:927
+#: ../gtk/gtkdialogs.c:949 ../gtk/gtkdialogs.c:969 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Alias"
+
+#: ../console/gntblist.c:308 ../console/gntblist.c:380
+msgid "Group"
+msgstr "Group"
+
+#: ../console/gntblist.c:311 ../console/gntblist.c:368
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Account"
+
+#: ../console/gntblist.c:317 ../console/gntblist.c:794 ../gtk/gtkblist.c:4896
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Add Buddy"
+
+#: ../console/gntblist.c:317
+msgid "Please enter buddy information."
+msgstr "Please enter buddy information."
+
+#: ../console/gntblist.c:340 ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "Chats"
+
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
+#: ../console/gntblist.c:374 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:781
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+msgid "Name"
+msgstr "Name"
+
+#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274
+msgid "Add Chat"
+msgstr "Add Chat"
+
+#: ../console/gntblist.c:384
+msgid "You can edit more information from the context menu later."
+msgstr "You can edit more information from the context menu later."
+
+#: ../console/gntblist.c:395 ../console/gntblist.c:408
+msgid "Error adding group"
+msgstr "Error adding group"
+
+#: ../console/gntblist.c:396
+msgid "You must give a name for the group to add."
+msgstr "You must give a name for the group to add."
+
+#: ../console/gntblist.c:409
+msgid "A group with the name already exists."
+msgstr "A group with that name already exists."
+
+#: ../console/gntblist.c:416 ../console/gntblist.c:798 ../gtk/gtkblist.c:5380
+#: ../libgaim/protocols/sametime/sametime.c:5310
+#: ../libgaim/protocols/sametime/sametime.c:5397
+msgid "Add Group"
+msgstr "Add Group"
+
+#: ../console/gntblist.c:416
+msgid "Enter the name of the group"
+msgstr "Enter the name of the group"
+
+#: ../console/gntblist.c:746
+msgid "Edit Chat"
+msgstr "Edit Chat"
+
+#: ../console/gntblist.c:746
+msgid "Please Update the necessary fields."
+msgstr "Please update the necessary fields."
+
+#: ../console/gntblist.c:747 ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "Edit"
+
+#: ../console/gntblist.c:761
+msgid "Auto-join"
+msgstr "Auto-join"
+
+#: ../console/gntblist.c:770
+msgid "Edit Settings"
+msgstr "Edit Settings"
+
+#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Get Info"
+
+#: ../console/gntblist.c:821
+msgid "Add Buddy Pounce"
+msgstr "Add Buddy Pounce"
+
+#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Send File"
+
+#: ../console/gntblist.c:832
+msgid "View Log"
+msgstr "View Log"
+
+#: ../console/gntblist.c:912
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Please enter the new name for %s"
+
+#: ../console/gntblist.c:914 ../console/gntblist.c:915
+#: ../console/gntblist.c:1084
+msgid "Rename"
+msgstr "Rename"
+
+#: ../console/gntblist.c:914
+msgid "Enter empty string to reset the name."
+msgstr "Enter empty string to reset the name."
+
+#: ../console/gntblist.c:987
+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"
+
+#: ../console/gntblist.c:995
+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"
+
+#: ../console/gntblist.c:1000
+#, 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?
+#: ../console/gntblist.c:1003
+msgid "Confirm Remove"
+msgstr "Confirm Remove"
+
+#: ../console/gntblist.c:1006 ../console/gntblist.c:1086
+#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Remove"
+
+#. Buddy List
+#: ../console/gntblist.c:1061 ../console/gntblist.c:1987
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "Buddy List"
+
+#: ../console/gntblist.c:1090
+msgid "Place tagged"
+msgstr "Place tagged"
+
+#: ../console/gntblist.c:1093
+msgid "Tag"
+msgstr "Tag"
+
+#: ../console/gntblist.c:1120 ../console/gntblist.c:1221
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Account: %s (%s)"
+
+#: ../console/gntblist.c:1145
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Idle: %s"
+
+#: ../console/gntblist.c:1200
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Nickname: %s\n"
+
+#: ../console/gntblist.c:1212
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Online: %d\n"
+"Total: %d"
+
+#: ../console/gntblist.c:1233
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Last Seen: %s ago"
+
+#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478
+#: ../gtk/gtkstatusbox.c:984
 msgid "New..."
 msgstr "New..."
 
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
+#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479
+#: ../gtk/gtkstatusbox.c:985
 msgid "Saved..."
 msgstr "Saved..."
 
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Show Buddy List"
-
-#: ../plugins/docklet/docklet.c:489
-msgid "Unread Messages"
-msgstr "Unread Messages"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "New Message..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
-msgid "Accounts"
-msgstr "Accounts"
-
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
+#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799
+#: ../gtk/gtkdialogs.c:879
+msgid "_Name"
+msgstr "_Name"
+
+#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804
+#: ../gtk/gtkdialogs.c:884
+msgid "_Account"
+msgstr "_Account"
+
+#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675
+msgid "New Instant Message"
+msgstr "New Instant Message"
+
+#: ../console/gntblist.c:1916 ../gtk/gtkdialogs.c:677
+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."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntblist.c:1919 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
+#: ../gtk/gtkdialogs.c:680 ../gtk/gtkdialogs.c:817 ../gtk/gtkdialogs.c:908
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1388
+#: ../libgaim/protocols/oscar/oscar.c:2152
+#: ../libgaim/protocols/oscar/oscar.c:2239
+#: ../libgaim/protocols/oscar/oscar.c:5733
+#: ../libgaim/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5962
+#: ../libgaim/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "OK"
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Options"
+
+#: ../console/gntblist.c:1944
+msgid "Send IM..."
+msgstr "Send IM..."
+
+#: ../console/gntblist.c:1948
+msgid "Toggle offline buddies"
+msgstr "Toggle offline buddies"
+
+#: ../console/gntblist.c:1952
+msgid "Sort by status"
+msgstr "Sort by status"
+
+#: ../console/gntblist.c:1956
+msgid "Sort alphabetically"
+msgstr "Sort alphabetically"
+
+#: ../console/gntblist.c:1960
+msgid "Sort by log size"
+msgstr "Sort by log size"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s disconnected."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s was disconnected because of the following error:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: ../console/gntconv.c:71
+msgid "No such command."
+msgstr "No such command."
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+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."
+
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+msgid "Your command failed for an unknown reason."
+msgstr "Your command failed for an unknown reason."
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+msgid "That command only works in chats, not IMs."
+msgstr "That command only works in chats, not IMs."
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+msgid "That command only works in IMs, not chats."
+msgstr "That command only works in IMs, not chats."
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+msgid "That command doesn't work on this protocol."
+msgstr "That command doesn't work on this protocol."
+
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Commands are not supported yet. Message was NOT sent."
+
+#: ../console/gntconv.c:198
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:219
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:349
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:443
+msgid "List of users:\n"
+msgstr "List of users:\n"
+
+#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+msgid "Supported debug options are:  version"
+msgstr "Supported debug options are:  version"
+
+#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+msgid "No such command (in this context)."
+msgstr "No such command (in this context)."
+
+#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+
+#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6732
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+
+#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6735
+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."
+
+#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6738
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+
+#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Clears the conversation scrollback."
+
+#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;command&gt;:  Help on a specific command."
+
+#: ../console/gntconv.c:661
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Show the plugins window"
+
+#: ../console/gntconv.c:664
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Show the buddy list."
+
+#: ../console/gntconv.c:667
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Show the accounts window."
+
+#: ../console/gntconv.c:670
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Show the debug window."
+
+#: ../console/gntconv.c:673
+msgid "prefs: Show the preference window."
+msgstr "prefs: Show the preference window."
+
+#: ../console/gntconv.c:676
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Show the saved-statuses window."
+
+#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Debug Window"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * 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.
+#.
+#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "Clear"
+
+#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Pause"
+
+#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Timestamps"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Try `%s -h' for more information.\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%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"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debug messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Emails"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "You have e-mail!"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1138
+msgid "From"
+msgstr "From"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Subject"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "Close"
+
+#: ../console/gntnotify.c:182
+#, 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."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "New Mail"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2612
+#, c-format
+msgid "Info for %s"
+msgstr "Info for %s"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Buddy Information"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Continue"
+
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Info"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+msgid "IM"
+msgstr "IM"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Join"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+msgid "Invite"
+msgstr "Invite"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(none)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Plugin needs to be loaded before you can configure it."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "Still need to do something about this."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "No configuration options for this plugin."
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr "You are (un)load plugins from the following list."
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Configure Plugin"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Show Idle Time"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Show Offline Buddies"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Show Timestamps"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Notify buddies when you are typing"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Log format"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Log IMs"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Log chats"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Log status change events"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "Conversations"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+msgid "Logging"
+msgstr "Logging"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
+#: ../gtk/gtkprefs.c:1945
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Quit"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Blink tray icon for unread..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "_Instant Messages:"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Never"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "In hidden conversations"
-
-#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Always"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "C_hat Messages:"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "When my nick is mentioned"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Displays an icon for Gaim in the system tray."
-
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Orientation"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "By conversation count"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Conversation Placement"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Number of conversations per window"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separate IM and Chat windows when placing by number"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Extra conversation placement options."
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Gaim File Control"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Allows you to control Gaim by entering commands in a file."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Demonstration Plug-in"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "An example plug-in that does stuff - see the description."
-
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"This is a really cool plug-in that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Cursor Colour"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hyperlink Colour"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView Expander Size"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView Horizontal Separation"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Conversation Entry"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Conversation History"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Log Viewer"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Request Dialog"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Notify Dialog"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView Indent Expanders"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Select Colour for %s"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Select Colour"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Select Font for %s"
-
-#: ../plugins/gaimrc.c:362
-msgid "Select Interface Font"
-msgstr "Select Interface Font"
-
-#: ../plugins/gaimrc.c:415
-msgid "General"
-msgstr "General"
-
-#: ../plugins/gaimrc.c:420
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Interface Font"
-
-#: ../plugins/gaimrc.c:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Text Shortcut Theme"
-
-#: ../plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "Interface colours"
-
-#: ../plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
-
-#: ../plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../plugins/gaimrc.c:543
-msgid "Tools"
-msgstr "Tools"
-
-#: ../plugins/gaimrc.c:548
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Write settings to %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:556
-msgid "Re-read gtkrc files"
-msgstr "Re-read gtkrc files"
-
-#: ../plugins/gaimrc.c:583
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ Theme Control"
-
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provides access to commonly used gtkrc settings."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Mouse Gestures Configuration"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Middle mouse button"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Right mouse button"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visual gesture display"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Mouse Gestures"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Provides support for mouse gestures"
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
-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."
-
-#. Extract their Name and put it in
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
-msgid "Name"
-msgstr "Name"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Instant Messaging"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
-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."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
-#: ../src/protocols/sametime/sametime.c:5532
-msgid "Search"
-msgstr "Search"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4535
-#: ../src/gtkblist.c:4899
-msgid "Group:"
-msgstr "Group:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
-#: ../plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "New Person"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
-msgid "Select Buddy"
-msgstr "Select Buddy"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "User _details"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Associate Buddy"
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
-msgid "None"
-msgstr "None"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
-#: ../src/gtkblist.c:4344 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Buddies"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Unable to send e-mail"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "The evolution executable was not found in the PATH."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "The specified buddy was not found in the Evolution Contacts."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Add to Address Book"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Send E-Mail"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution Integration Configuration"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Select all accounts that buddies should be auto-added to."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
-msgid "Account"
-msgstr "Account"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution Integration"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Provides integration with Evolution."
-
-#: ../plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "Please enter the person's information below."
-
-#: ../plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Please enter the buddy's screen name and account type below."
-
-#: ../plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "Account type:"
-
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-msgid "Screen name:"
-msgstr "Screen name:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "Optional information:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-#: ../plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "Forename"
-
-#: ../plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "Surname"
-
-#: ../plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK Signals Test"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../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."
-
-#: ../plugins/history.c:120
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Not implemented yet."
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Are you sure you want to delete \"%s\"?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "Delete Status"
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Saved Statuses"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "Title"
+
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Type"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
+#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1205
+#: ../libgaim/protocols/jabber/jabber.c:1215
+#: ../libgaim/protocols/jabber/jabber.c:1225
+#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libgaim/protocols/jabber/jabber.c:1245
+#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5397
+#: ../libgaim/protocols/oscar/oscar.c:5412
+#: ../libgaim/protocols/oscar/oscar.c:5417
+#: ../libgaim/protocols/oscar/oscar.c:5625
+#: ../libgaim/protocols/oscar/oscar.c:5637
+#: ../libgaim/protocols/oscar/oscar.c:5650
+#: ../libgaim/protocols/oscar/oscar.c:5657
+#: ../libgaim/protocols/oscar/oscar.c:5664
+#: ../libgaim/protocols/sametime/sametime.c:3259
+#: ../libgaim/protocols/sametime/sametime.c:3265
+#: ../libgaim/protocols/sametime/sametime.c:3271
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "Message"
+
+#. Use
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+msgid "Use"
+msgstr "Use"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "Invalid title"
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "Please enter a non-empty title for the status."
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "Duplicate title"
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "Please enter a different title for the status."
+
+#: ../console/gntstatus.c:439
+msgid "Substatus"
+msgstr "Sub-status"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+msgid "Account:"
+msgstr "Account:"
+
+#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Status:"
+
+#: ../console/gntstatus.c:465
+msgid "Message:"
+msgstr "Message:"
+
+#: ../console/gntstatus.c:514
+msgid "Edit Status"
+msgstr "Edit Status"
+
+#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1176
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "Status"
+
+#: ../console/gntstatus.c:556
+msgid "Use different status for following accounts"
+msgstr "Use different status for the following accounts"
+
+#. Save & Use
+#: ../console/gntstatus.c:590
+msgid "Save & Use"
+msgstr "Save & Use"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Statuses"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s just signed on"
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s just signed off"
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s sent you a message"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s said your nick in %s"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s sent a message in %s"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Buddy signs on/off"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "You receive an IM"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Someone speaks in chat"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Someone says your name in chat"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Notify with a toaster when"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "Beep too!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Set URGENT for the terminal window."
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for Gaim-Text."
+msgstr "Toaster plugin for Gaim-Text."
+
+#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<h1>Conversation with %s on %s:</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "History Plug-in Requires Logging"
 
-#: ../plugins/history.c:148
+#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -799,15 +1086,15 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "History"
-
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "GntHistory"
+
+#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: ../plugins/history.c:191
+#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -815,1493 +1102,186 @@
 "When a new conversation is opened this plug-in will insert the last "
 "conversation into the current conversation."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Iconify on Away"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../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."
-
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
-msgid "Minutes"
-msgstr "Minutes"
-
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
-
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
-msgid "Set Account Idle Time"
-msgstr "Set Account Idle Time"
-
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
-msgid "_Set"
-msgstr "_Set"
-
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#: ../plugins/idle.c:177
-msgid "None of your accounts are idle."
-msgstr "None of your accounts are idle."
-
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-msgid "Unset Account Idle Time"
-msgstr "Unset Account Idle Time"
-
-#: ../plugins/idle.c:196
-msgid "_Unset"
-msgstr "_Unset"
-
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
-msgid "Set Idle Time for All Accounts"
-msgstr "Set Idle Time for All Accounts"
-
-#: ../plugins/idle.c:262
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Unset Idle Time For All Idled Accounts"
-
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-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"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC Test Client"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Test plug-in IPC support, as a client."
-
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Test plug-in IPC support, as a client. This locates the server plug-in and "
-"calls the commands registered."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC Test Server"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Test plug-in IPC support, as a server."
-
-#. *  description
-#: ../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."
-
-#: ../plugins/log_reader.c:1407
-msgid "User is offline."
-msgstr "User is offline."
-
-#: ../plugins/log_reader.c:1413
-msgid "Auto-response sent:"
-msgstr "Auto-response sent:"
-
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
-#, c-format
-msgid "%s has signed off."
-msgstr "%s has signed off."
-
-#: ../plugins/log_reader.c:1440
-msgid "One or more messages may have been undeliverable."
-msgstr "One or more messages may not have been delivered."
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "You were disconnected from the server."
-
-#: ../plugins/log_reader.c:1458
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-
-#: ../plugins/log_reader.c:1473
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Message could not be sent because the maximum length was exceeded."
-
-#: ../plugins/log_reader.c:1478
-msgid "Message could not be sent."
-msgstr "Message could not be sent."
-
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
-
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "Fire"
-
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1912
-msgid "General Log Reading Configuration"
-msgstr "General Log Reading Configuration"
-
-#: ../plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "Fast size calculations"
-
-#: ../plugins/log_reader.c:1920
-msgid "Use name heuristics"
-msgstr "Use name heuristics"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
-msgid "Log Directory"
-msgstr "Log Directory"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1969
-msgid "Log Reader"
-msgstr "Log Reader"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1973
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Includes other IM clients' logs in the log viewer."
-
-#. * description
-#: ../plugins/log_reader.c:1977
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
-msgstr ""
-"When viewing logs, this plug-in will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Mail Checker"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Checks for new local mail."
-
-#: ../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."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono Plug-in Loader"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Loads .NET plug-ins with Mono."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Music messaging session confirmed."
-
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Music Messaging"
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "There was a conflict in running the command:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Error Running Editor"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "The following error has occurred:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "Music Messaging Configuration"
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Score Editor Path"
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "_Apply"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Music Messaging Plugin for collaborative composition."
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"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."
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Notify For"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "_IM windows"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "C_hat windows"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_Only when someone says your nick"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_Focused windows"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Notification Methods"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Prepend _string into window title:"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Insert c_ount of new messages into window title"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Set window manager \"_URGENT\" hint"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "R_aise conversation window"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Notification Removal"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Remove when conversation window _gains focus"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Remove when conversation window _receives click"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Remove when _typing in conversation window"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Remove when a _message gets sent"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Remove on switch to conversation ta_b"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Message Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Provides a variety of ways of notifying you of unread messages."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl Plug-in Loader"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Provides support for loading perl plug-ins."
-
-#: ../plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr "Psychic Mode"
-
-#: ../plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
-msgstr "Psychic mode for incoming conversation"
-
-#: ../plugins/psychic.c:24
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-
-#: ../plugins/psychic.c:60
-msgid "You feel a disturbance in the force..."
-msgstr "You have a premonition..."
-
-#: ../plugins/psychic.c:79
-msgid "Only enable for users on the buddy list"
-msgstr "Only enable for users on the buddy list"
-
-#: ../plugins/psychic.c:84
-msgid "Disable when away"
-msgstr "Disable when away"
-
-#: ../plugins/psychic.c:88
-msgid "Display notification message in conversations"
-msgstr "Display notification message in conversations"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Raw"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Lets you send raw input to text-based protocols."
-
-#: ../plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "You are using Gaim version %s.  The current version is %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-
-#: ../plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"You can get version %s from <br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "New Version Available"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Release Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Checks periodically for new releases."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Signals Test"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "Test to see that all signals are working properly."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr "Simple Plug-in"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr "Tests to see that most things are working."
-
-#: ../plugins/spellchk.c:1917
-msgid "Duplicate Correction"
-msgstr "Duplicate Correction"
-
-#: ../plugins/spellchk.c:1918
-msgid "The specified word already exists in the correction list."
-msgstr "The specified word already exists in the correction list."
-
-#: ../plugins/spellchk.c:2127
-msgid "Text Replacements"
-msgstr "Text Replacements"
-
-#: ../plugins/spellchk.c:2150
-msgid "You type"
-msgstr "You type"
-
-#: ../plugins/spellchk.c:2164
-msgid "You send"
-msgstr "You send"
-
-#: ../plugins/spellchk.c:2178
-msgid "Whole words only"
-msgstr "Whole words only"
-
-#: ../plugins/spellchk.c:2190
-msgid "Case sensitive"
-msgstr "Case sensitive"
-
-#: ../plugins/spellchk.c:2216
-msgid "Add a new text replacement"
-msgstr "Add a new text replacement"
-
-#: ../plugins/spellchk.c:2232
-msgid "You _type:"
-msgstr "You _type:"
-
-#: ../plugins/spellchk.c:2249
-msgid "You _send:"
-msgstr "You _send:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Exact case match (uncheck for automatic case handling)"
-
-#: ../plugins/spellchk.c:2263
-msgid "Only replace _whole words"
-msgstr "Only replace _whole words"
-
-#: ../plugins/spellchk.c:2288
-msgid "General Text Replacement Options"
-msgstr "General Text Replacement Options"
-
-#: ../plugins/spellchk.c:2289
-msgid "Enable replacement of last word on send"
-msgstr "Enable replacement of last word on send"
-
-#: ../plugins/spellchk.c:2314
-msgid "Text replacement"
-msgstr "Text replacement"
-
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Replaces text in outgoing messages according to user-defined rules."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
-msgid "Provides SSL support through GNUTLS."
-msgstr "Provides SSL support through GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Provides SSL support through Mozilla NSS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Provides a wrapper around SSL support libraries."
-
-#: ../plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s is no longer away."
-
-#: ../plugins/statenotify.c:51
-#, c-format
-msgid "%s has gone away."
-msgstr "%s has gone away."
-
-#: ../plugins/statenotify.c:61
-#, c-format
-msgid "%s has become idle."
-msgstr "%s has become idle."
-
-#: ../plugins/statenotify.c:63
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s is no longer idle."
-
-#: ../plugins/statenotify.c:72
-#, c-format
-msgid "%s has signed on."
-msgstr "%s has signed on."
-
-#: ../plugins/statenotify.c:90
-msgid "Notify When"
-msgstr "Notify When"
-
-#: ../plugins/statenotify.c:93
-msgid "Buddy Goes _Away"
-msgstr "Buddy Goes _Away"
-
-#: ../plugins/statenotify.c:96
-msgid "Buddy Goes _Idle"
-msgstr "Buddy Becomes _Idle"
-
-#: ../plugins/statenotify.c:99
-msgid "Buddy _Signs On/Off"
-msgstr "Buddy _Signs On/Off"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:141
-msgid "Buddy State Notification"
-msgstr "Buddy State Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Tcl Plug-in Loader"
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "Provides support for loading Tcl plug-ins"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Buddy Ticker"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "A horizontal scrolling version of the buddy list."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat Timestamp"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Delay"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutes."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:254
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Adds iChat-style timestamps to conversations every N minutes."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Timestamp Format Options"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Force (traditional Gaim) 24-hour time format"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Show dates in..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Co_nversations"
-
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "For delayed messages"
-
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "For delayed messages and in chats"
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Message Logs:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "Message Timestamp Formats"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "Customises the message timestamp formats."
-
-#. *  description
-#: ../plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"This plug-in allows the user to customize conversation and logging message "
-"timestamp formats."
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Opacity:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "IM Conversation Windows"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_IM window transparency"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Show slider bar in IM window"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Remove IM window transparency on focus"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Always on top"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Buddy List Window"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Buddy List window transparency"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Remove Buddy List window transparency on focus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Transparency"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variable Transparency for the buddy list and conversations."
-
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"This plug-in enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plug-in requires Win2000 or greater."
-
-#: ../plugins/win32/winprefs/winprefs.c:397
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime Version"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
-msgid "Startup"
-msgstr "Startup"
-
-#: ../plugins/win32/winprefs/winprefs.c:406
-msgid "_Start Gaim on Windows startup"
-msgstr "_Start Gaim on Windows startup"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3588
-msgid "Buddy List"
-msgstr "Buddy List"
-
-#: ../plugins/win32/winprefs/winprefs.c:418
-msgid "_Dockable Buddy List"
-msgstr "_Dockable Buddy List"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
-msgid "_Keep Buddy List window on top:"
-msgstr "_Keep Buddy List window on top:"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
-msgid "Only when docked"
-msgstr "Only when docked"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
-msgid "Conversations"
-msgstr "Conversations"
-
-#: ../plugins/win32/winprefs/winprefs.c:432
-msgid "_Flash window when messages are received"
-msgstr "_Flash window when messages are received"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "WinGaim Options"
-msgstr "WinGaim Options"
-
-#: ../plugins/win32/winprefs/winprefs.c:458
-msgid "Options specific to Windows Gaim."
-msgstr "Options specific to Windows Gaim."
-
-#: ../plugins/win32/winprefs/winprefs.c:459
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "accounts"
-
-#: ../src/account.c:923
-msgid "Password is required to sign on."
-msgstr "Password is required to sign on."
-
-#: ../src/account.c:948
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Enter password for %s (%s)"
-
-#: ../src/account.c:955
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../src/account.c:960
-msgid "Save password"
-msgstr "Save password"
-
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3472
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:785
-#: ../src/gtkrequest.c:271 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
-msgid "OK"
-msgstr "OK"
-
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4940
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:786
-#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
-#: ../src/gtkdialogs.c:891 ../src/gtkdialogs.c:946 ../src/gtkdialogs.c:983
-#: ../src/gtkdialogs.c:1008 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:272 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
-#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
-#: ../src/protocols/oscar/oscar.c:8392
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../src/account.c:994 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Missing protocol plug-in for %s"
-
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3464
-#: ../src/gtkblist.c:3470
-msgid "Connection Error"
-msgstr "Connection Error"
-
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
-msgid "New passwords do not match."
-msgstr "New passwords do not match."
-
-#: ../src/account.c:1085
-msgid "Fill out all fields completely."
-msgstr "Fill out all fields completely."
-
-#: ../src/account.c:1108
-msgid "Original password"
-msgstr "Original password"
-
-#: ../src/account.c:1115
-msgid "New password"
-msgstr "New password"
-
-#: ../src/account.c:1122
-msgid "New password (again)"
-msgstr "New password (again)"
-
-#: ../src/account.c:1128
-#, c-format
-msgid "Change password for %s"
-msgstr "Change password for %s"
-
-#: ../src/account.c:1136
-msgid "Please enter your current password and your new password."
-msgstr "Please enter your current password and your new password."
-
-#: ../src/account.c:1169
-#, c-format
-msgid "Change user information for %s"
-msgstr "Change user information for %s"
-
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:278
-#: ../src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "Save"
-
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "buddy list"
-
-#: ../src/blist.c:1173
-msgid "Chats"
-msgstr "Chats"
-
-#: ../src/blist.c:1894
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgstr[1] ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-
-#: ../src/blist.c:1904
-msgid "Group not removed"
-msgstr "Group not removed"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Registration Error"
-
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s signed on"
-
-#: ../src/connection.c:322
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s signed off"
-
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "Unable to send message: The message is too large."
-
-#: ../src/conversation.c:166 ../src/conversation.c:179
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Unable to send message to %s."
-
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "The message is too large."
-
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "Unable to send message."
-
-#: ../src/conversation.c:1517
-#, c-format
-msgid "%s entered the room."
-msgstr "%s entered the room."
-
-#: ../src/conversation.c:1520
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] entered the room."
-
-#: ../src/conversation.c:1627
-#, c-format
-msgid "You are now known as %s"
-msgstr "You are now known as %s"
-
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s is now known as %s"
-
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s left the room."
-
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s left the room (%s)."
-
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr "No name"
-
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Error reading %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Error writing %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Error accessing %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Cannot send a file of 0 bytes."
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Cannot send a directory."
-
-#: ../src/ft.c:249
-#, 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"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s wants to send you %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s wants to send you a file"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Accept file transfer request from %s?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-
-#: ../src/ft.c:391
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s is offering to send file %s"
-
-#: ../src/ft.c:442
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s is not a valid filename.\n"
-
-#: ../src/ft.c:463
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Offering to send %s to %s"
-
-#: ../src/ft.c:474
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Starting transfer of %s from %s"
-
-#: ../src/ft.c:628
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Transfer of file %s complete"
-
-#: ../src/ft.c:631
-msgid "File transfer complete"
-msgstr "File transfer complete"
-
-#: ../src/ft.c:1022
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "You cancelled the transfer of %s"
-
-#: ../src/ft.c:1027
-msgid "File transfer cancelled"
-msgstr "File transfer cancelled"
-
-#: ../src/ft.c:1084
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s cancelled the transfer of %s"
-
-#: ../src/ft.c:1089
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s cancelled the file transfer"
-
-#: ../src/ft.c:1146
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "File transfer to %s failed."
-
-#: ../src/ft.c:1148
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "File transfer from %s failed."
-
-#: ../src/gtkaccount.c:374
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: Searches for a substring in the backlog."
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr "Lastlog plugin for gaim-text."
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientation"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "The orientation of the tray."
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Alias"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Join"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Close _tabs"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "I_M"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "_Get Info"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Invite"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Modify"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Open Mail"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Pause"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
-msgid "Protocol:"
-msgstr "Protocol:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Password:"
-
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4518 ../src/gtkblist.c:4884
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "Remember password"
+#: ../gtk/gtkaccount.c:483
+msgid "Local alias:"
+msgstr "Local alias:"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "User Options"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "New mail notifications"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "Buddy icon:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr "Use this buddy icon for this account:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: ../src/gtkaccount.c:1245
+#: ../gtk/gtkaccount.c:879
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1251
+#: ../gtk/gtkaccount.c:885
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1257
+#: ../gtk/gtkaccount.c:891
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: ../src/gtkaccount.c:1297
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:936
+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.
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr "If you look real closely"
-
-#: ../src/gtkaccount.c:1317
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkaccount.c:1352
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../src/gtkaccount.c:1736
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3473
-msgid "Modify Account"
-msgstr "Modify Account"
-
-#: ../src/gtkaccount.c:1760
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "_Advanced"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
 msgid "Register"
 msgstr "Register"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Are you sure you want to delete %s?"
-
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:275
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Delete"
-
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
-msgid "Screen Name"
-msgstr "Screen Name"
-
-#: ../src/gtkaccount.c:2259
+#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/gtkaccount.c:2586
-#, 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"
-
-#: ../src/gtkaccount.c:2635
-msgid "Add buddy to your list?"
-msgstr "Add buddy to your list?"
-
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4939 ../src/gtkconv.c:1597
-#: ../src/gtkrequest.c:276 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
-msgid "Add"
-msgstr "Add"
-
-#: ../src/gtkblist.c:670
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: ../src/gtkblist.c:691
+#: ../gtk/gtkblist.c:726
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2309,213 +1289,199 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: ../src/gtkblist.c:702 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../src/gtkblist.c:946
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: ../src/gtkblist.c:949 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "I_M"
-
-#: ../src/gtkblist.c:955
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "_Send File"
 
-#: ../src/gtkblist.c:962
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: ../src/gtkblist.c:966 ../src/gtkblist.c:970 ../src/gtkblist.c:1069
-#: ../src/gtkblist.c:1092
+#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../src/gtkblist.c:981
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:984 ../src/gtkconv.c:1594 ../src/gtkrequest.c:277
-msgid "Remove"
-msgstr "Remove"
-
-#: ../src/gtkblist.c:990 ../src/gtkblist.c:1077 ../src/gtkblist.c:1098
+#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
+#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../src/gtkblist.c:1040
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: ../src/gtkblist.c:1042
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: ../src/gtkblist.c:1045
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: ../src/gtkblist.c:1047
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
 msgstr "_Rename"
 
-#. join button
-#: ../src/gtkblist.c:1065 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Join"
-
-#: ../src/gtkblist.c:1067
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: ../src/gtkblist.c:1105 ../src/gtkblist.c:1128
+#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: ../src/gtkblist.c:1133
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../src/gtkblist.c:1379 ../src/gtkblist.c:1391 ../src/gtkblist.c:3733
-#: ../src/gtkblist.c:3743
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
+#: ../gtk/gtkblist.c:4125
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4197 ../src/gtkpounce.c:426
+#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4345 ../gtk/gtkpounce.c:422
 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."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2500
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2501
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: ../src/gtkblist.c:2430
+#: ../gtk/gtkblist.c:2502
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: ../src/gtkblist.c:2431
+#: ../gtk/gtkblist.c:2503
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: ../src/gtkblist.c:2432
+#: ../gtk/gtkblist.c:2504
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: ../src/gtkblist.c:2434
+#: ../gtk/gtkblist.c:2506
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2507
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: ../src/gtkblist.c:2436
+#: ../gtk/gtkblist.c:2508
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddies/Show Buddy _Details"
 
-#: ../src/gtkblist.c:2437
+#: ../gtk/gtkblist.c:2509
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddies/Show Idle _Times"
 
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2510
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddies/_Sort Buddies"
 
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2512
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: ../src/gtkblist.c:2441
+#: ../gtk/gtkblist.c:2513
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: ../src/gtkblist.c:2442
+#: ../gtk/gtkblist.c:2514
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2516
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2447
+#: ../gtk/gtkblist.c:2519
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5518
+#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Accounts/Add\\/Edit"
 
 #. Tools
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2523
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2524
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tools/Buddy _Pounces"
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2525
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
-#: ../src/gtkblist.c:2454
+#: ../gtk/gtkblist.c:2526
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: ../src/gtkblist.c:2455
+#: ../gtk/gtkblist.c:2527
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2529
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2530
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: ../src/gtkblist.c:2459
+#: ../gtk/gtkblist.c:2531
 msgid "/Tools/System _Log"
 msgstr "/Tools/System _Log"
 
-#: ../src/gtkblist.c:2461
+#: ../gtk/gtkblist.c:2533
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
 #. Help
-#: ../src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2536
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../src/gtkblist.c:2465
+#: ../gtk/gtkblist.c:2537
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: ../src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2538
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: ../src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2539
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
+#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
 #, c-format
 msgid ""
 "\n"
@@ -2524,7 +1490,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: ../src/gtkblist.c:2580
+#: ../gtk/gtkblist.c:2652
 #, c-format
 msgid ""
 "\n"
@@ -2533,7 +1499,7 @@
 "\n"
 "<b>Buddy Alias:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2542,7 +1508,7 @@
 "\n"
 "<b>Nickname:</b> %s"
 
-#: ../src/gtkblist.c:2601
+#: ../gtk/gtkblist.c:2673
 #, c-format
 msgid ""
 "\n"
@@ -2551,7 +1517,7 @@
 "\n"
 "<b>Logged In:</b> %s"
 
-#: ../src/gtkblist.c:2612
+#: ../gtk/gtkblist.c:2684
 #, c-format
 msgid ""
 "\n"
@@ -2560,7 +1526,7 @@
 "\n"
 "<b>Idle:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../gtk/gtkblist.c:2719
 #, c-format
 msgid ""
 "\n"
@@ -2569,7 +1535,7 @@
 "\n"
 "<b>Last Seen:</b> %s ago"
 
-#: ../src/gtkblist.c:2656
+#: ../gtk/gtkblist.c:2728
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2577,7 +1543,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: ../src/gtkblist.c:2667
+#: ../gtk/gtkblist.c:2739
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2585,7 +1551,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: ../src/gtkblist.c:2669
+#: ../gtk/gtkblist.c:2741
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2593,7 +1559,7 @@
 "\n"
 "<b>Status:</b> Awesome"
 
-#: ../src/gtkblist.c:2671
+#: ../gtk/gtkblist.c:2743
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2601,125 +1567,146 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: ../src/gtkblist.c:2960
+#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
+#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5447
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Offline"
+
+#: ../gtk/gtkblist.c:3226
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Idle %dh %02dm"
 
-#: ../src/gtkblist.c:2962
+#: ../gtk/gtkblist.c:3228
 #, c-format
 msgid "Idle %dm"
 msgstr "Idle %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2965 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1801
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2826
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Idle"
 
-#: ../src/gtkblist.c:3097
+#: ../gtk/gtkblist.c:3359
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddies/New Instant Message..."
 
-#: ../src/gtkblist.c:3098 ../src/gtkblist.c:3131
+#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: ../src/gtkblist.c:3099
+#: ../gtk/gtkblist.c:3361
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddies/Get User Info..."
 
-#: ../src/gtkblist.c:3100
+#: ../gtk/gtkblist.c:3362
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddies/Add Buddy..."
 
-#: ../src/gtkblist.c:3101 ../src/gtkblist.c:3134
+#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddies/Add Chat..."
 
-#: ../src/gtkblist.c:3102
+#: ../gtk/gtkblist.c:3364
 msgid "/Buddies/Add Group..."
 msgstr "/Buddies/Add Group..."
 
-#: ../src/gtkblist.c:3137
+#: ../gtk/gtkblist.c:3399
 msgid "/Tools/Buddy Pounces"
 msgstr "/Tools/Buddy Pounces"
 
-#: ../src/gtkblist.c:3140
+#: ../gtk/gtkblist.c:3402
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: ../src/gtkblist.c:3143
+#: ../gtk/gtkblist.c:3405
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: ../src/gtkblist.c:3337
+#: ../gtk/gtkblist.c:3501 ../gtk/gtkdocklet.c:149
+#, 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"
+
+#: ../gtk/gtkblist.c:3577
 msgid "Manually"
 msgstr "Manually"
 
-#: ../src/gtkblist.c:3339
+#: ../gtk/gtkblist.c:3579
 msgid "Alphabetically"
 msgstr "Alphabetically"
 
-#: ../src/gtkblist.c:3340
+#: ../gtk/gtkblist.c:3580
 msgid "By status"
 msgstr "By status"
 
-#: ../src/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3581
 msgid "By log size"
 msgstr "By log size"
 
-#: ../src/gtkblist.c:3458 ../src/gtkconn.c:196
+#: ../gtk/gtkblist.c:3789 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s disconnected"
 
-#: ../src/gtkblist.c:3474 ../src/protocols/sametime/sametime.c:3630
+#: ../gtk/gtkblist.c:3798 ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Connect"
 msgstr "Connect"
 
-#: ../src/gtkblist.c:3474 ../src/gtkblist.c:5617
-msgid "Enable Account"
-msgstr "Enable Account"
-
-#: ../src/gtkblist.c:3495
+#: ../gtk/gtkblist.c:3798
+msgid "Re-enable Account"
+msgstr "Re-enable Account"
+
+#: ../gtk/gtkblist.c:3819
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s disconnected: %s</span>"
 
-#: ../src/gtkblist.c:3622
+#: ../gtk/gtkblist.c:3948
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3727
+#: ../gtk/gtkblist.c:4109
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: ../src/gtkblist.c:3730
+#: ../gtk/gtkblist.c:4112
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: ../src/gtkblist.c:3736
+#: ../gtk/gtkblist.c:4118
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddies/Show Buddy Details"
 
-#: ../src/gtkblist.c:3739
+#: ../gtk/gtkblist.c:4121
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddies/Show Idle Times"
 
-#: ../src/gtkblist.c:4451 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
-msgid "Add Buddy"
-msgstr "Add Buddy"
-
-#: ../src/gtkblist.c:4475
+#: ../gtk/gtkblist.c:4786 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "Buddies"
+
+#: ../gtk/gtkblist.c:4920
 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. "
@@ -2729,20 +1716,17 @@
 "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"
 
-#: ../src/gtkblist.c:4497
-msgid "Screen Name:"
-msgstr "Screen Name:"
-
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4545 ../src/gtkblist.c:4864
-msgid "Account:"
-msgstr "Account:"
-
-#: ../src/gtkblist.c:4797
+#: ../gtk/gtkblist.c:4980 ../gtk/gtkblist.c:5343
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Group:"
+
+#: ../gtk/gtkblist.c:5241
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: ../src/gtkblist.c:4813
+#: ../gtk/gtkblist.c:5257
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2750,11 +1734,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: ../src/gtkblist.c:4830
-msgid "Add Chat"
-msgstr "Add Chat"
-
-#: ../src/gtkblist.c:4854
+#: ../gtk/gtkblist.c:5298
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2762,103 +1742,63 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: ../src/gtkblist.c:4936 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
-msgid "Add Group"
-msgstr "Add Group"
-
-#: ../src/gtkblist.c:4937
+#: ../gtk/gtkblist.c:5381
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: ../src/gtkblist.c:5558
+#: ../gtk/gtkblist.c:6007
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
-#: ../src/gtkblist.c:5591 ../src/gtkblist.c:5597
+#: ../gtk/gtkblist.c:6040 ../gtk/gtkblist.c:6046 ../gtk/gtkconv.c:2839
 msgid "No actions available"
 msgstr "No actions available"
 
-#: ../src/gtkblist.c:5605
+#: ../gtk/gtkblist.c:6054
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../src/gtkblist.c:5670
+#: ../gtk/gtkblist.c:6066
+msgid "Enable Account"
+msgstr "Enable Account"
+
+#: ../gtk/gtkblist.c:6119
 msgid "/Tools"
 msgstr "/Tools"
 
-#: ../src/gtkblist.c:5756
+#: ../gtk/gtkblist.c:6205
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
-#: ../src/gtkconn.c:197
-#, c-format
-msgid ""
-"%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-"%s was disconnected due to an error. %s\n"
+#: ../gtk/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
-
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are:  version"
-msgstr "Supported debug options are:  version"
-
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "No such command (in this context)."
-
-#: ../src/gtkconv.c:412
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-
-#: ../src/gtkconv.c:484
-msgid "No such command."
-msgstr "No such command."
-
-#: ../src/gtkconv.c:491
-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."
-
-#: ../src/gtkconv.c:496
-msgid "Your command failed for an unknown reason."
-msgstr "Your command failed for an unknown reason."
-
-#: ../src/gtkconv.c:503
-msgid "That command only works in chats, not IMs."
-msgstr "That command only works in chats, not IMs."
-
-#: ../src/gtkconv.c:506
-msgid "That command only works in IMs, not chats."
-msgstr "That command only works in IMs, not chats."
-
-#: ../src/gtkconv.c:510
-msgid "That command doesn't work on this protocol."
-msgstr "That command doesn't work on this protocol."
-
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+msgstr ""
+"%s\n"
+"\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+
+#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "That buddy is not on the same protocol as this chat."
 
-#: ../src/gtkconv.c:764
+#: ../gtk/gtkconv.c:766
 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."
 
-#: ../src/gtkconv.c:817
+#: ../gtk/gtkconv.c:819
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../gtk/gtkconv.c:849
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2866,711 +1806,748 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: ../src/gtkconv.c:868
+#: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Message:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2380 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: ../src/gtkconv.c:951
+#: ../gtk/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../gtk/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Find"
 
-#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: ../src/gtkconv.c:1293
+#: ../gtk/gtkconv.c:1321
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logging started. Future messages in this conversation will be logged."
 
-#: ../src/gtkconv.c:1301
+#: ../gtk/gtkconv.c:1329
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logging stopped. Future messages in this conversation will not be logged."
 
-#: ../src/gtkconv.c:1559
-msgid "IM"
-msgstr "IM"
-
-#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:714
-msgid "Send File"
-msgstr "Send File"
-
-#: ../src/gtkconv.c:1572
+#: ../gtk/gtkconv.c:1597
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: ../src/gtkconv.c:1575
+#: ../gtk/gtkconv.c:1600
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../src/gtkconv.c:1581
-msgid "Info"
-msgstr "Info"
-
-#: ../src/gtkconv.c:1587
+#: ../gtk/gtkconv.c:1620
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-#: ../src/gtkconv.c:1602
+#: ../gtk/gtkconv.c:1643
 msgid "Last said"
 msgstr "Last said"
 
-#: ../src/gtkconv.c:2388
+#: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: ../src/gtkconv.c:2412
+#: ../gtk/gtkconv.c:2479
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: ../src/gtkconv.c:2461
+#: ../gtk/gtkconv.c:2528
 msgid "Animate"
 msgstr "Animate"
 
-#: ../src/gtkconv.c:2466
+#: ../gtk/gtkconv.c:2533
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: ../src/gtkconv.c:2472
+#: ../gtk/gtkconv.c:2536
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
+#: ../gtk/gtkconv.c:2540
+msgid "Set Custom Icon..."
+msgstr "Set Custom Icon..."
+
+#: ../gtk/gtkconv.c:2547
+msgid "Remove Custom Icon"
+msgstr "Remove Custom Icon"
+
 #. Conversation menu
-#: ../src/gtkconv.c:2613
+#: ../gtk/gtkconv.c:2688
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../src/gtkconv.c:2615
+#: ../gtk/gtkconv.c:2690
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: ../src/gtkconv.c:2620
+#: ../gtk/gtkconv.c:2695
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: ../src/gtkconv.c:2622
+#: ../gtk/gtkconv.c:2697
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2698
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2700
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
-#: ../src/gtkconv.c:2629
+#: ../gtk/gtkconv.c:2704
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: ../src/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2705
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2707
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: ../src/gtkconv.c:2634
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: ../src/gtkconv.c:2639
+#: ../gtk/gtkconv.c:2711
+msgid "/Conversation/M_ore"
+msgstr "/Conversation/M_ore"
+
+#: ../gtk/gtkconv.c:2715
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: ../src/gtkconv.c:2641
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: ../src/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: ../src/gtkconv.c:2645
+#: ../gtk/gtkconv.c:2721
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: ../src/gtkconv.c:2650
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: ../src/gtkconv.c:2652
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: ../src/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2733
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: ../src/gtkconv.c:2661
+#: ../gtk/gtkconv.c:2737
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../src/gtkconv.c:2662
+#: ../gtk/gtkconv.c:2738
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: ../src/gtkconv.c:2663
+#: ../gtk/gtkconv.c:2739
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: ../src/gtkconv.c:2664
+#: ../gtk/gtkconv.c:2740
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Show Buddy _Icons"
 
-#: ../src/gtkconv.c:2666
+#: ../gtk/gtkconv.c:2742
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbars"
 
-#: ../src/gtkconv.c:2667
+#: ../gtk/gtkconv.c:2743
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: ../src/gtkconv.c:2759
+#: ../gtk/gtkconv.c:2818
+msgid "/Conversation/More"
+msgstr "/Conversation/More"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
+msgid "/Conversation"
+msgstr "/Conversation"
+
+#: ../gtk/gtkconv.c:2903
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: ../src/gtkconv.c:2765
+#: ../gtk/gtkconv.c:2909
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: ../src/gtkconv.c:2769
+#: ../gtk/gtkconv.c:2913
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: ../src/gtkconv.c:2775
+#: ../gtk/gtkconv.c:2919
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: ../src/gtkconv.c:2779
+#: ../gtk/gtkconv.c:2923
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: ../src/gtkconv.c:2785
+#: ../gtk/gtkconv.c:2929
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: ../src/gtkconv.c:2789
+#: ../gtk/gtkconv.c:2933
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: ../src/gtkconv.c:2793
+#: ../gtk/gtkconv.c:2937
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: ../src/gtkconv.c:2797
+#: ../gtk/gtkconv.c:2941
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: ../src/gtkconv.c:2803
+#: ../gtk/gtkconv.c:2947
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2951
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2957
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: ../src/gtkconv.c:2816
+#: ../gtk/gtkconv.c:2960
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: ../src/gtkconv.c:2829
+#: ../gtk/gtkconv.c:2973
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbars"
 
-#: ../src/gtkconv.c:2832
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#: ../src/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Show Buddy Icons"
 
-#: ../src/gtkconv.c:2915
+#: ../gtk/gtkconv.c:3055
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: ../src/gtkconv.c:2918
+#: ../gtk/gtkconv.c:3058
 msgid "User has typed something and stopped"
 msgstr "User has typed something and stopped"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3101
+#: ../gtk/gtkconv.c:3241
 msgid "_Send To"
 msgstr "_Send To"
 
-#: ../src/gtkconv.c:3753
+#: ../gtk/gtkconv.c:3943
 msgid "_Send"
 msgstr "_Send"
 
-#: ../src/gtkconv.c:3808 ../src/protocols/sametime/sametime.c:3572
+#: ../gtk/gtkconv.c:3997 ../libgaim/protocols/sametime/sametime.c:3557
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3860
+#: ../gtk/gtkconv.c:4049
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: ../src/gtkconv.c:3939
-msgid "IM the user"
-msgstr "IM the user"
-
-#: ../src/gtkconv.c:3952
-msgid "Ignore the user"
-msgstr "Ignore the user"
-
-#: ../src/gtkconv.c:3964
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
-#: ../src/gtkconv.c:4938 ../src/gtkconv.c:5047
+#: ../gtk/gtkconv.c:5096 ../gtk/gtkconv.c:5217
 #, 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"
 
-#: ../src/gtkconv.c:6520
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-
-#: ../src/gtkconv.c:6523
-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."
-
-#: ../src/gtkconv.c:6526
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-
-#: ../src/gtkconv.c:6529
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Clears the conversation scrollback."
-
-#: ../src/gtkconv.c:6532
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;command&gt;:  Help on a specific command."
-
-#: ../src/gtkconv.c:6691
+#: ../gtk/gtkconv.c:5770 ../gtk/gtkstatusbox.c:541
+msgid "Typing"
+msgstr "Typing"
+
+#: ../gtk/gtkconv.c:5776
+msgid "Stopped Typing"
+msgstr "Stopped Typing"
+
+#: ../gtk/gtkconv.c:5781
+msgid "Nick Said"
+msgstr "Nick Said"
+
+#: ../gtk/gtkconv.c:5786 ../gtk/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Unread Messages"
+
+#: ../gtk/gtkconv.c:5791
+msgid "New Event"
+msgstr "New Event"
+
+#: ../gtk/gtkconv.c:6905
 msgid "Confirm close"
 msgstr "Confirm close"
 
-#: ../src/gtkconv.c:6723
+#: ../gtk/gtkconv.c:6937
 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?"
 
-#: ../src/gtkconv.c:7245
+#: ../gtk/gtkconv.c:7472
 msgid "Close other tabs"
 msgstr "Close other tabs"
 
-#: ../src/gtkconv.c:7251
+#: ../gtk/gtkconv.c:7478
 msgid "Close all tabs"
 msgstr "Close all tabs"
 
-#: ../src/gtkconv.c:7259
+#: ../gtk/gtkconv.c:7486
 msgid "Detach this tab"
 msgstr "Detach this tab"
 
-#: ../src/gtkconv.c:7265
+#: ../gtk/gtkconv.c:7492
 msgid "Close this tab"
 msgstr "Close this tab"
 
-#: ../src/gtkconv.c:7527
+#: ../gtk/gtkconv.c:7760
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: ../src/gtkconv.c:7991
+#: ../gtk/gtkconv.c:8224
 msgid "Last created window"
 msgstr "Last created window"
 
-#: ../src/gtkconv.c:7993
+#: ../gtk/gtkconv.c:8226
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: ../src/gtkconv.c:7995 ../src/gtkprefs.c:1243
+#: ../gtk/gtkconv.c:8228 ../gtk/gtkprefs.c:1297
 msgid "New window"
 msgstr "New window"
 
-#: ../src/gtkconv.c:7997
+#: ../gtk/gtkconv.c:8230
 msgid "By group"
 msgstr "By group"
 
-#: ../src/gtkconv.c:7999
+#: ../gtk/gtkconv.c:8232
 msgid "By account"
 msgstr "By account"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Invert"
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Highlight matches"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Debug Window"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Clear"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Timestamps"
-
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "_Icon Only"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "_Text Only"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Both Icon & Text"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filter"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Right click for more options."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Level "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Select the debug filter level."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "All"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Misc"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Warning"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Error "
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Fatal Error"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "lead developer"
 
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
 msgid "developer"
 msgstr "developer"
 
-#: ../src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "win32 port"
-
-#: ../src/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: ../src/gtkdialogs.c:72
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "support"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../gtk/gtkdialogs.c:101
+msgid "win32 port"
+msgstr "win32 port"
+
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../src/gtkdialogs.c:96
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "libfaim maintainer"
 
-#: ../src/gtkdialogs.c:97
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "Jabber developer"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "original author"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:186
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../src/gtkdialogs.c:110
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:187 ../gtk/gtkdialogs.c:188
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+msgid "Valencian-Catalan"
+msgstr "Valencian Catalan"
+
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:189
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Danish"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:190
 msgid "German"
 msgstr "German"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Australian English"
 
-#: ../src/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "British English"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:133
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
+#: ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
+msgid "Euskera(Basque)"
+msgstr "Euskera (Basque)"
+
+#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139
 msgid "Persian"
 msgstr "Persian"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
 msgid "French"
 msgstr "French"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:142
+msgid "Galician"
+msgstr "Galician"
+
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:144
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:146
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../src/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:147
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:202
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:205
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:206
 msgid "Georgian"
 msgstr "Georgian"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
 msgid "Korean"
 msgstr "Korean"
 
-#: ../src/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154
 msgid "Kurdish"
 msgstr "Kurdish"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:156
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../src/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:157
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../gtk/gtkdialogs.c:158
 msgid "Dutch, Flemish"
 msgstr "Dutch, Flemish"
 
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:159
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:210
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:162
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:163
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: ../src/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:164
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:211 ../gtk/gtkdialogs.c:212
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:167
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:213
+msgid "Slovak"
+msgstr "Slovak"
+
+#: ../gtk/gtkdialogs.c:169
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:170
+msgid "Albanian"
+msgstr "Albanian"
+
+#: ../gtk/gtkdialogs.c:171 ../gtk/gtkdialogs.c:214
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:172
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:173
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:174
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gtk/gtkdialogs.c:175
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:176
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:176
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:215
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:216
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: ../src/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:185
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../src/gtkdialogs.c:186
-msgid "Slovak"
-msgstr "Slovak"
-
-#: ../src/gtkdialogs.c:230
+#: ../gtk/gtkdialogs.c:297
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: ../src/gtkdialogs.c:254
+#: ../gtk/gtkdialogs.c:331
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
-"file for the complete list of contributors.  We provide no warranty for this "
-"program.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with Gaim.  Gaim is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
-"file for the complete list of contributors.  We provide no warranty for this "
-"program.<BR><BR>"
-
-#: ../src/gtkdialogs.c:268
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with Gaim.  Gaim is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:346
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:271
+#: ../gtk/gtkdialogs.c:349
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:277
+#: ../gtk/gtkdialogs.c:355
 msgid "Current Developers"
 msgstr "Current Developers"
 
-#: ../src/gtkdialogs.c:292
+#: ../gtk/gtkdialogs.c:370
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: ../src/gtkdialogs.c:307
+#: ../gtk/gtkdialogs.c:385
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:400
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: ../src/gtkdialogs.c:342
+#: ../gtk/gtkdialogs.c:420
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: ../src/gtkdialogs.c:360
+#: ../gtk/gtkdialogs.c:438
 msgid "Debugging Information"
 msgstr "Debugging Information"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:766
-msgid "_Name"
-msgstr "_Name"
-
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:771
-msgid "_Account"
-msgstr "_Account"
-
-#: ../src/gtkdialogs.c:579
-msgid "New Instant Message"
-msgstr "New Instant Message"
-
-#: ../src/gtkdialogs.c:581
-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."
-
-#: ../src/gtkdialogs.c:716
+#: ../gtk/gtkdialogs.c:812
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: ../src/gtkdialogs.c:718
+#: ../gtk/gtkdialogs.c:814
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3578,11 +2555,11 @@
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 
-#: ../src/gtkdialogs.c:780
+#: ../gtk/gtkdialogs.c:903
 msgid "View User Log"
 msgstr "View User Log"
 
-#: ../src/gtkdialogs.c:782
+#: ../gtk/gtkdialogs.c:905
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3590,37 +2567,32 @@
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 
-#: ../src/gtkdialogs.c:801
+#: ../gtk/gtkdialogs.c:924
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: ../src/gtkdialogs.c:802
+#: ../gtk/gtkdialogs.c:925
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: ../src/gtkdialogs.c:804 ../src/gtkdialogs.c:826 ../src/gtkdialogs.c:846
-#: ../src/gtkrequest.c:279 ../src/protocols/silc/chat.c:586
-msgid "Alias"
-msgstr "Alias"
-
-#: ../src/gtkdialogs.c:822
+#: ../gtk/gtkdialogs.c:945
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: ../src/gtkdialogs.c:824
+#: ../gtk/gtkdialogs.c:947
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: ../src/gtkdialogs.c:843
+#: ../gtk/gtkdialogs.c:966
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: ../src/gtkdialogs.c:844
+#: ../gtk/gtkdialogs.c:967
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: ../src/gtkdialogs.c:881
+#: ../gtk/gtkdialogs.c:1004
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3635,15 +2607,32 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: ../src/gtkdialogs.c:889
+#: ../gtk/gtkdialogs.c:1012
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: ../src/gtkdialogs.c:890
+#: ../gtk/gtkdialogs.c:1013
 msgid "_Remove Contact"
 msgstr "_Remove Contact"
 
-#: ../src/gtkdialogs.c:941
+#: ../gtk/gtkdialogs.c:1043
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+
+#: ../gtk/gtkdialogs.c:1050
+msgid "Merge Groups"
+msgstr "Merge Groups"
+
+#: ../gtk/gtkdialogs.c:1051
+msgid "_Merge Groups"
+msgstr "_Merge Groups"
+
+#: ../gtk/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3652,30 +2641,30 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: ../src/gtkdialogs.c:944
+#: ../gtk/gtkdialogs.c:1104
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/gtkdialogs.c:945
+#: ../gtk/gtkdialogs.c:1105
 msgid "_Remove Group"
 msgstr "_Remove Group"
 
-#: ../src/gtkdialogs.c:978
+#: ../gtk/gtkdialogs.c:1138
 #, 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?"
 
-#: ../src/gtkdialogs.c:981
+#: ../gtk/gtkdialogs.c:1141
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: ../src/gtkdialogs.c:982
+#: ../gtk/gtkdialogs.c:1142
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: ../src/gtkdialogs.c:1003
+#: ../gtk/gtkdialogs.c:1163
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3684,179 +2673,249 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: ../src/gtkdialogs.c:1006
+#: ../gtk/gtkdialogs.c:1166
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: ../src/gtkdialogs.c:1007
+#: ../gtk/gtkdialogs.c:1167
 msgid "_Remove Chat"
 msgstr "_Remove Chat"
 
-#: ../src/gtkft.c:139
+#: ../gtk/gtkdocklet.c:146
+msgid "Right-click for more unread messages...\n"
+msgstr "Right-click for more unread messages...\n"
+
+#: ../gtk/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Change Status"
+
+#: ../gtk/gtkdocklet.c:446 ../gtk/gtkstatusbox.c:971
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Available"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:450 ../gtk/gtkprefs.c:1815 ../gtk/gtkstatusbox.c:972
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
+#: ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4408
+#: ../libgaim/protocols/oscar/oscar.c:5475
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Away"
+
+#: ../gtk/gtkdocklet.c:454 ../gtk/gtkstatusbox.c:973
+#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../gtk/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "Show Buddy List"
+
+#: ../gtk/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "New Message..."
+
+#: ../gtk/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Mute Sounds"
+
+#: ../gtk/gtkdocklet.c:543
+msgid "Blink on new message"
+msgstr "Blink on new message"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:554
+msgid "Quit"
+msgstr "Quit"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "Not started"
+
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "Finished"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: ../src/gtkft.c:219
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "File Transfers - %d%% of %d files"
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "File Transfers"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Receiving As:</b>"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: ../src/gtkft.c:225
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: ../src/gtkft.c:443
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: ../src/gtkft.c:448
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: ../src/gtkft.c:485
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error launching %s: %s"
 
-#: ../src/gtkft.c:494
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Error running %s"
 
-#: ../src/gtkft.c:495
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Process returned error code %d"
 
-#: ../src/gtkft.c:589
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/gtkft.c:596
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Filename"
 
-#: ../src/gtkft.c:603
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Size"
 
-#: ../src/gtkft.c:610
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Remaining"
 
-#: ../src/gtkft.c:641
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Filename:"
 
-#: ../src/gtkft.c:642
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Local File:"
 
-#: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Status:"
-
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../src/gtkft.c:645
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: ../src/gtkft.c:708
-msgid "File Transfers"
-msgstr "File Transfers"
-
-#: ../src/gtkft.c:731
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "Close this window when all transfers _finish"
 
-#: ../src/gtkft.c:741
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "C_lear finished transfers"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "File transfer _details"
 
-#. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Pause"
-
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Resume"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "Failed"
 
-#: ../src/gtkimhtml.c:821
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Paste as Plain _Text"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Clear formatting"
-
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:831
+msgid "_Reset formatting"
+msgstr "_Reset formatting"
+
+#: ../gtk/gtkimhtml.c:1323
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: ../src/gtkimhtml.c:1329
+#: ../gtk/gtkimhtml.c:1324
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: ../src/gtkimhtml.c:1332
+#: ../gtk/gtkimhtml.c:1327
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
 
-#: ../src/gtkimhtml.c:1333
+#: ../gtk/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
-#: ../src/gtkimhtml.c:1554
+#: ../gtk/gtkimhtml.c:1549
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: ../src/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1561
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/gtkimhtml.c:1576
+#: ../gtk/gtkimhtml.c:1571
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../src/gtkimhtml.c:3273
+#: ../gtk/gtkimhtml.c:3303
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3866,7 +2925,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../src/gtkimhtml.c:3276
+#: ../gtk/gtkimhtml.c:3306
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3876,7 +2935,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../src/gtkimhtml.c:3289
+#: ../gtk/gtkimhtml.c:3319
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3887,7 +2946,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../gtk/gtkimhtml.c:3322
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3898,35 +2957,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../gtk/gtkimhtml.c:3402 ../gtk/gtkimhtml.c:3414
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../src/gtkimhtml.c:3412
+#: ../gtk/gtkimhtml.c:3442
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Select Font"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Description"
 
-#: ../src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3934,95 +2993,99 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 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."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Underline"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
-msgstr "Font Face"
-
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Font face"
+
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Background colour"
 
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../gtk/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Reset formatting"
+
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Insert link"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Insert image"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: ../src/gtklog.c:188
+#: ../gtk/gtklog.c:219
 #, 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>"
 
-#: ../src/gtklog.c:193
+#: ../gtk/gtklog.c:224
 #, 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>"
 
-#: ../src/gtklog.c:242
+#: ../gtk/gtklog.c:273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:295
+#: ../gtk/gtklog.c:320
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4030,7 +3093,7 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 
-#: ../src/gtklog.c:299
+#: ../gtk/gtklog.c:324
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4038,40 +3101,40 @@
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 
-#: ../src/gtklog.c:302
+#: ../gtk/gtklog.c:327
 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."
 
-#: ../src/gtklog.c:306
+#: ../gtk/gtklog.c:331
 msgid "No logs were found"
 msgstr "No logs were found"
 
-#: ../src/gtklog.c:382
+#: ../gtk/gtklog.c:410
 msgid "Total log size:"
 msgstr "Total log size:"
 
-#: ../src/gtklog.c:458
+#: ../gtk/gtklog.c:476
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations in %s"
 
-#: ../src/gtklog.c:466 ../src/gtklog.c:517
+#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#: ../src/gtklog.c:542
+#: ../gtk/gtklog.c:560
 msgid "System Log"
 msgstr "System Log"
 
-#: ../src/gtkmain.c:308
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: ../src/gtkmain.c:310
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4096,7 +3159,7 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../src/gtkmain.c:493
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4135,34 +3198,22 @@
 "on other protocols is at\n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:327
-msgid "New Mail"
-msgstr "New Mail"
-
-#: ../src/gtknotify.c:343
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Open All Messages"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
-msgid "From"
-msgstr "From"
-
-#: ../src/gtknotify.c:418
-msgid "Subject"
-msgstr "Subject"
-
-#: ../src/gtknotify.c:427
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#: ../src/gtknotify.c:493
+#: ../gtk/gtknotify.c:498
 #, 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."
 
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4173,53 +3224,44 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5450
 msgid "Search Results"
 msgstr "Search Results"
 
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
-#, c-format
-msgid "Info for %s"
-msgstr "Info for %s"
-
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Buddy Information"
-
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "The browser command <b>%s</b> is invalid."
-
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
-#: ../src/gtknotify.c:1034
+#: ../gtk/gtknotify.c:890
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "The browser command \"%s\" is invalid."
+
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Error launching <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:1035
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Error launching \"%s\": %s"
+
+#: ../gtk/gtknotify.c:1046
 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."
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "The following plug-ins will be unloaded."
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Multiple plug-ins will be unloaded."
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Unload Plug-ins"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4230,7 +3272,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">Filename:</span>\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4241,201 +3283,205 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plug-in website for an update.</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configure Pl_ug-in"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plug-in Details</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../src/gtkpounce.c:259
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
-#: ../src/gtkpounce.c:547
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Pounce When Buddy..."
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "Si_gns on"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "Signs o_ff"
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "Goes a_way"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "Ret_urn from away"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "Becomes _idle"
 
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "Is no longer i_dle"
 
-#: ../src/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "Starts _typing"
 
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "P_auses while typing"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "Stops t_yping"
 
-#: ../src/gtkpounce.c:597
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Sends a _message"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Action"
 
-#: ../src/gtkpounce.c:637
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Ope_n a message window"
 
-#: ../src/gtkpounce.c:639
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Pop up a notification"
 
-#: ../src/gtkpounce.c:641
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: ../src/gtkpounce.c:643
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: ../src/gtkpounce.c:645
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: ../src/gtkpounce.c:650
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "Brows_e..."
 
-#: ../src/gtkpounce.c:652
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "Br_owse..."
 
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
-msgid "Options"
-msgstr "Options"
-
-#: ../src/gtkpounce.c:773
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "P_ounce only when my status is \"not available\""
 
-#: ../src/gtkpounce.c:778
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Recurring"
 
-#: ../src/gtkpounce.c:1092
+#: ../gtk/gtkpounce.c:1085
 #, 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?"
 
-#: ../src/gtkpounce.c:1240
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
-#: ../src/gtkpounce.c:1275
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../src/gtkpounce.c:1322
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Buddy Pounces"
 
-#: ../src/gtkpounce.c:1449
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../gtk/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s has paused while typing to you (%s)"
+
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley theme failed to unpack."
 
-#: ../src/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:638
 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."
@@ -4443,52 +3489,129 @@
 "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."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "Icon"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Description"
 
-#: ../src/gtkprefs.c:821
-msgid "_Hide new IM conversations"
-msgstr "_Hide new conversations:"
-
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Show system tray icon:"
+
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1640
+#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "Always"
+
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1805
+#: ../gtk/gtkprefs.c:1819 ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "Never"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "On unread messages"
+
+#: ../gtk/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Conversation Window Hiding"
+
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Hide new IM conversations:"
+
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1820
 msgid "When away"
 msgstr "When away"
 
-#: ../src/gtkprefs.c:828
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Send unknown \"_slash\" commands as messages"
-
-#: ../src/gtkprefs.c:830
+#. All the tab options!
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Tabs"
+
+#: ../gtk/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Show IMs and chats in _tabbed windows"
+
+#: ../gtk/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Show close b_utton on tabs"
+
+#: ../gtk/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Placement"
+
+#: ../gtk/gtkprefs.c:859
+msgid "Top"
+msgstr "Top"
+
+#: ../gtk/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Bottom"
+
+#: ../gtk/gtkprefs.c:861
+msgid "Left"
+msgstr "Left"
+
+#: ../gtk/gtkprefs.c:862
+msgid "Right"
+msgstr "Right"
+
+#: ../gtk/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Left Vertical"
+
+#: ../gtk/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Right Vertical"
+
+#: ../gtk/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "N_ew conversations:"
+
+#: ../gtk/gtkprefs.c:900
 msgid "Show _formatting on incoming messages"
 msgstr "Show _formatting on incoming messages"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:903
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:905
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:912
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:915
 msgid "Highlight _misspelled words"
 msgstr "Highlight _misspelled words"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:919
 msgid "Use smooth-scrolling"
 msgstr "Use smooth-scrolling"
 
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "F_lash window when IMs are received"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Default Formatting"
+
+#: ../gtk/gtkprefs.c:941
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4496,161 +3619,124 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#. All the tab options!
-#: ../src/gtkprefs.c:887
-msgid "Tab Options"
-msgstr "Tab Options"
-
-#: ../src/gtkprefs.c:889
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Show IMs and chats in _tabbed windows"
-
-#: ../src/gtkprefs.c:903
-msgid "Show close b_utton on tabs"
-msgstr "Show close b_utton on tabs"
-
-#: ../src/gtkprefs.c:909
-msgid "_Placement:"
-msgstr "_Placement"
-
-#: ../src/gtkprefs.c:911
-msgid "Top"
-msgstr "Top"
-
-#: ../src/gtkprefs.c:912
-msgid "Bottom"
-msgstr "Bottom"
-
-#: ../src/gtkprefs.c:913
-msgid "Left"
-msgstr "Left"
-
-#: ../src/gtkprefs.c:914
-msgid "Right"
-msgstr "Right"
-
-#: ../src/gtkprefs.c:916
-msgid "Left Vertical"
-msgstr "Left Vertical"
-
-#: ../src/gtkprefs.c:917
-msgid "Right Vertical"
-msgstr "Right Vertical"
-
-#: ../src/gtkprefs.c:922
-msgid "N_ew conversations:"
-msgstr "N_ew conversations:"
-
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3629
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:1012
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../src/gtkprefs.c:977
+#: ../gtk/gtkprefs.c:1024
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Example: stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:1028
 msgid "_Autodetect IP address"
 msgstr "_Autodetect IP address"
 
-#: ../src/gtkprefs.c:986
+#: ../gtk/gtkprefs.c:1037
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: ../src/gtkprefs.c:1014
+#: ../gtk/gtkprefs.c:1066
 msgid "Ports"
 msgstr "Ports"
 
-#: ../src/gtkprefs.c:1017
+#: ../gtk/gtkprefs.c:1069
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: ../src/gtkprefs.c:1020
+#: ../gtk/gtkprefs.c:1072
 msgid "_Start port:"
 msgstr "_Start port:"
 
-#: ../src/gtkprefs.c:1027
+#: ../gtk/gtkprefs.c:1079
 msgid "_End port:"
 msgstr "_End port:"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1087
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: ../src/gtkprefs.c:1039
+#: ../gtk/gtkprefs.c:1091
 msgid "No proxy"
 msgstr "No proxy"
 
-#: ../src/gtkprefs.c:1095
+#: ../gtk/gtkprefs.c:1147
 msgid "_User:"
 msgstr "_User:"
 
-#: ../src/gtkprefs.c:1157
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1158
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1159
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1160
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1161
-msgid "GNOME Default"
-msgstr "GNOME Default"
-
-#: ../src/gtkprefs.c:1162
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../src/gtkprefs.c:1163
+#: ../gtk/gtkprefs.c:1210
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1211
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1212
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1213
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1164
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1165
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1174
+#: ../gtk/gtkprefs.c:1214
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1215
+msgid "GNOME Default"
+msgstr "GNOME Default"
+
+#: ../gtk/gtkprefs.c:1216
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1217
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1218
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1219
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1228
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/gtkprefs.c:1227
+#: ../gtk/gtkprefs.c:1281
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: ../src/gtkprefs.c:1231
+#: ../gtk/gtkprefs.c:1285
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkprefs.c:1239
+#: ../gtk/gtkprefs.c:1293
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: ../src/gtkprefs.c:1241
+#: ../gtk/gtkprefs.c:1295
 msgid "Browser default"
 msgstr "Browser default"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1296
 msgid "Existing window"
 msgstr "Existing window"
 
-#: ../src/gtkprefs.c:1244
+#: ../gtk/gtkprefs.c:1298
 msgid "New tab"
 msgstr "New tab"
 
-#: ../src/gtkprefs.c:1258
+#: ../gtk/gtkprefs.c:1312
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4659,83 +3745,79 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
-msgid "Logging"
-msgstr "Logging"
-
-#: ../src/gtkprefs.c:1297
+#: ../gtk/gtkprefs.c:1352
 msgid "Log _format:"
 msgstr "Log _format:"
 
-#: ../src/gtkprefs.c:1302
+#: ../gtk/gtkprefs.c:1357
 msgid "Log all _instant messages"
 msgstr "Log all _instant messages"
 
-#: ../src/gtkprefs.c:1304
+#: ../gtk/gtkprefs.c:1359
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: ../src/gtkprefs.c:1306
+#: ../gtk/gtkprefs.c:1361
 msgid "Log all _status changes to system log"
 msgstr "Log all _status changes to system log"
 
-#: ../src/gtkprefs.c:1454
+#: ../gtk/gtkprefs.c:1507
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: ../src/gtkprefs.c:1462
+#: ../gtk/gtkprefs.c:1515
 msgid "Quietest"
 msgstr "Quietest"
 
-#: ../src/gtkprefs.c:1464
+#: ../gtk/gtkprefs.c:1517
 msgid "Quieter"
 msgstr "Quieter"
 
-#: ../src/gtkprefs.c:1466
+#: ../gtk/gtkprefs.c:1519
 msgid "Quiet"
 msgstr "Quiet"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1521 ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/gtkprefs.c:1470
+#: ../gtk/gtkprefs.c:1523
 msgid "Loud"
 msgstr "Loud"
 
-#: ../src/gtkprefs.c:1472
+#: ../gtk/gtkprefs.c:1525
 msgid "Louder"
 msgstr "Louder"
 
-#: ../src/gtkprefs.c:1474
+#: ../gtk/gtkprefs.c:1527
 msgid "Loudest"
 msgstr "Loudest"
 
-#: ../src/gtkprefs.c:1537
+#: ../gtk/gtkprefs.c:1590
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: ../src/gtkprefs.c:1538
+#: ../gtk/gtkprefs.c:1591
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../src/gtkprefs.c:1540
+#: ../gtk/gtkprefs.c:1593
 msgid "Console beep"
 msgstr "Console beep"
 
-#: ../src/gtkprefs.c:1542
+#: ../gtk/gtkprefs.c:1595
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/gtkprefs.c:1547
+#: ../gtk/gtkprefs.c:1598
 msgid "Command"
 msgstr "Command"
 
-#: ../src/gtkprefs.c:1548
+#: ../gtk/gtkprefs.c:1599
 msgid "No sounds"
 msgstr "No sounds"
 
-#: ../src/gtkprefs.c:1556
+#: ../gtk/gtkprefs.c:1607
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4744,458 +3826,398 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: ../src/gtkprefs.c:1582
+#: ../gtk/gtkprefs.c:1633
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: ../src/gtkprefs.c:1583
+#: ../gtk/gtkprefs.c:1634
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: ../src/gtkprefs.c:1585
-msgid "_Sounds while away"
-msgstr "_Sounds while away"
-
-#: ../src/gtkprefs.c:1592
+#: ../gtk/gtkprefs.c:1636
+msgid "Enable sounds:"
+msgstr "Enable sounds:"
+
+#: ../gtk/gtkprefs.c:1638
+msgid "Only when available"
+msgstr "Only when available"
+
+#: ../gtk/gtkprefs.c:1639
+msgid "Only when not available"
+msgstr "Only when not available"
+
+#: ../gtk/gtkprefs.c:1647
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../src/gtkprefs.c:1620
+#: ../gtk/gtkprefs.c:1675
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: ../src/gtkprefs.c:1671
+#: ../gtk/gtkprefs.c:1726
 msgid "Play"
 msgstr "Play"
 
-#: ../src/gtkprefs.c:1678
+#: ../gtk/gtkprefs.c:1733
 msgid "Event"
 msgstr "Event"
 
-#: ../src/gtkprefs.c:1697
+#: ../gtk/gtkprefs.c:1752
 msgid "Test"
 msgstr "Test"
 
-#: ../src/gtkprefs.c:1701
+#: ../gtk/gtkprefs.c:1756
 msgid "Reset"
 msgstr "Reset"
 
-#: ../src/gtkprefs.c:1705
+#: ../gtk/gtkprefs.c:1760
 msgid "Choose..."
 msgstr "Choose..."
 
-#: ../src/gtkprefs.c:1747
+#: ../gtk/gtkprefs.c:1803
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
 
-#: ../src/gtkprefs.c:1750
+#: ../gtk/gtkprefs.c:1806
 msgid "From last sent message"
 msgstr "From last sent message"
 
-#: ../src/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1808
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-#: ../src/gtkprefs.c:1761
+#: ../gtk/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1821
 msgid "When both away and idle"
 msgstr "When both away and idle"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../gtk/gtkprefs.c:1827
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: ../src/gtkprefs.c:1773
+#: ../gtk/gtkprefs.c:1829
 msgid "Change status when _idle"
 msgstr "Change status when _idle"
 
-#: ../src/gtkprefs.c:1777
+#: ../gtk/gtkprefs.c:1833
 msgid "_Minutes before changing status:"
 msgstr "_Minutes before changing status:"
 
-#: ../src/gtkprefs.c:1785
+#: ../gtk/gtkprefs.c:1841
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
-msgid "Status at startup"
-msgstr "Status at startup"
-
-#: ../src/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1862
+msgid "Status at Startup"
+msgstr "Status at Startup"
+
+#: ../gtk/gtkprefs.c:1864
 msgid "Use status from last _exit at startup"
 msgstr "Use status from last _exit at startup"
 
-#: ../src/gtkprefs.c:1814
+#: ../gtk/gtkprefs.c:1870
 msgid "Status to a_pply at startup:"
 msgstr "Status to a_pply at startup:"
 
-#: ../src/gtkprefs.c:1865
+#: ../gtk/gtkprefs.c:1908
+msgid "Interface"
+msgstr "Interface"
+
+#: ../gtk/gtkprefs.c:1910
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: ../src/gtkprefs.c:1866
+#: ../gtk/gtkprefs.c:1911
 msgid "Sounds"
 msgstr "Sounds"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
+#: ../gtk/gtkprefs.c:1912 ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "Network"
 
-#: ../src/gtkprefs.c:1872
+#: ../gtk/gtkprefs.c:1917
 msgid "Browser"
 msgstr "Browser"
 
-#: ../src/gtkprefs.c:1876
-msgid "Away / Idle"
-msgstr "Away / Idle"
-
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprefs.c:1921
+msgid "Status / Idle"
+msgstr "Status / Idle"
+
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Allow only the users below"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Block all users"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permit User"
 
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: ../src/gtkprivacy.c:564
+#: ../gtk/gtkprivacy.c:562
 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."
 
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permit"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
 #, 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?"
 
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Block User"
 
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: ../src/gtkprivacy.c:603
+#: ../gtk/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."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Block"
 
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
 
-#: ../src/gtkrequest.c:269 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/gtkrequest.c:270 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "No"
 
-#: ../src/gtkrequest.c:273
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Apply"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
-msgid "Close"
-msgstr "Close"
-
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: ../src/gtkrequest.c:1514 ../src/gtkrequest.c:1555
+#: ../gtk/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: ../gtk/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Choose New Name"
+
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Save File..."
 
-#: ../src/gtkrequest.c:1515 ../src/gtkrequest.c:1556
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Open File..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Select Folder..."
+
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Add"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Room List"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "_Get List"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "_Add Chat"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
-msgid "Title"
-msgstr "Title"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Type"
-
-#. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
-#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
-msgid "Message"
-msgstr "Message"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Saved Statuses"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Use"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Title already in use.  You must choose a unique title."
 
-#: ../src/gtksavedstatuses.c:879
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Different"
 
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2881
-msgid "Status"
-msgstr "Status"
-
-#: ../src/gtksavedstatuses.c:1073
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Use a _different status for some accounts"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: ../src/gtksavedstatuses.c:1394
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Message received"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Message sent"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: ../src/gtksound.c:68
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: ../src/gtksound.c:69
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "Someone says your name in chat"
-
-#: ../src/gtksound.c:489
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Unable to play sound because the chosen file (%s) does not exist."
-
-#: ../src/gtksound.c:505
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-
-#: ../src/gtksound.c:517
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Typing"
+#: ../gtk/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Someone says your screen name in chat"
+
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer Failure"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer failed to initialize."
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3678
+#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Close _tabs"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Get Info"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Invite"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Modify"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Open Mail"
-
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:545
+msgid "Waiting for network connection"
+msgstr "Waiting for network connection"
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1412
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -5203,11 +4225,11 @@
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: ../src/gtkutils.c:1439
+#: ../gtk/gtkutils.c:1441
 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."
@@ -5215,23 +4237,23 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "Send image file"
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1450
 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?"
 
-#: ../src/gtkutils.c:1453
+#: ../gtk/gtkutils.c:1455
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -5239,7 +4261,7 @@
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../src/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -5252,11 +4274,11 @@
 #. * 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
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1511
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -5264,38 +4286,1644 @@
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "Sent Doodle request."
-
-#: ../src/log.c:167
+#: ../gtk/gtkutils.c:2340
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+#: ../gtk/gtkutils.c:2733
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Failed to open file \"%s\": %s"
+
+#: ../gtk/gtkutils.c:2782
+#, 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"
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Save File"
+
+#: ../gtk/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Select colour"
+
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "Display Statistics"
+
+#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "Responses Probability:"
+
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "Statistics Configuration"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+msgid "Maximum response timeout:"
+msgstr "Maximum response timeout:"
+
+#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+msgid "minutes"
+msgstr "minutes"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr "Maximum last-seen difference:"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "Threshold:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr "Contact Availability Prediction plugin."
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:934
+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."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Buddy is idle"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Buddy is away"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Buddy is away for an extended period"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Buddy is mobile"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Buddy is offline"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Point values to use when..."
+
+#: ../gtk/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"
+msgstr ""
+"The buddy with the <i>highest score</i> is the buddy who will have priority "
+"in the contact.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Use last buddy when scores are equal"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Point values to use for account..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Contact Priority"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Allows for controlling the values associated with different buddy states."
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "By conversation count"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Conversation Placement"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Number of conversations per window"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separate IM and Chat windows when placing by number"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Extra conversation placement options."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim Demonstration Plug-in"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "An example plug-in that does stuff - see the description."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"This is a really cool plug-in that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Cursor Colour"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Secondary Cursor Colour"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hyperlink Colour"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView Expander Size"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView Horizontal Separation"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Conversation Entry"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Conversation History"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Log Viewer"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Request Dialog"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Notify Dialog"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView Indent Expanders"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Select Colour for %s"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Select Colour"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Select Font for %s"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Select Interface Font"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "General"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ Interface Font"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ Text Shortcut Theme"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Interface colours"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Widget Sizes"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Fonts"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Tools"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Write settings to %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Re-read gtkrc files"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim GTK+ Theme Control"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Provides access to commonly used gtkrc settings."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Mouse Gestures Configuration"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Middle mouse button"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Right mouse button"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Visual gesture display"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Mouse Gestures"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Provides support for mouse gestures"
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+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."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Instant Messaging"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+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."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6087 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5523
+msgid "Search"
+msgstr "Search"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "New Person"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Select Buddy"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "User _details"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Associate Buddy"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1145
+msgid "None"
+msgstr "None"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "Unable to send e-mail"
+msgstr "Unable to send e-mail"
+
+#: ../gtk/plugins/gevolution/gevolution.c:264
+msgid "The evolution executable was not found in the PATH."
+msgstr "The evolution executable was not found in the PATH."
+
+#: ../gtk/plugins/gevolution/gevolution.c:270
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "The specified buddy was not found in the Evolution Contacts."
+
+#: ../gtk/plugins/gevolution/gevolution.c:287
+msgid "Add to Address Book"
+msgstr "Add to Address Book"
+
+#: ../gtk/plugins/gevolution/gevolution.c:291
+msgid "Send E-Mail"
+msgstr "Send E-Mail"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:418
+msgid "Evolution Integration Configuration"
+msgstr "Evolution Integration Configuration"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:421
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Select all accounts that buddies should be auto-added to."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:528
+msgid "Evolution Integration"
+msgstr "Evolution Integration"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:531
+#: ../gtk/plugins/gevolution/gevolution.c:533
+msgid "Provides integration with Evolution."
+msgstr "Provides integration with Evolution."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Please enter the person's information below."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Please enter the buddy's screen name and account type below."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Account type:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Optional information:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Forename"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Surname"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK Signals Test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/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."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "History"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Iconify on Away"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/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."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Mail Checker"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Checks for new local mail."
+
+#: ../gtk/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."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Music messaging session confirmed."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "There was a conflict in running the command:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Error Running Editor"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "The following error has occurred:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "Music Messaging Configuration"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Score Editor Path"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Apply"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Music Messaging Plugin for collaborative composition."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"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."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Notify For"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "_IM windows"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "C_hat windows"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Only when someone says your screen name"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "_Focused windows"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "Notification Methods"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Prepend _string into window title:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Insert c_ount of new messages into window title"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "Insert count of new messages into _X property"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Set window manager \"_URGENT\" hint"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "R_aise conversation window"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Notification Removal"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Remove when conversation window _gains focus"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Remove when conversation window _receives click"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Remove when _typing in conversation window"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Remove when a _message gets sent"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Remove on switch to conversation ta_b"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Message Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Provides a variety of ways of notifying you of unread messages."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raw"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Lets you send raw input to text-based protocols."
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "You are using Gaim version %s.  The current version is %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"You can get version %s from <br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "New Version Available"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Release Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Checks periodically for new releases."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+
+#: ../gtk/plugins/spellchk.c:1963
+msgid "Duplicate Correction"
+msgstr "Duplicate Correction"
+
+#: ../gtk/plugins/spellchk.c:1964
+msgid "The specified word already exists in the correction list."
+msgstr "The specified word already exists in the correction list."
+
+#: ../gtk/plugins/spellchk.c:2172
+msgid "Text Replacements"
+msgstr "Text Replacements"
+
+#: ../gtk/plugins/spellchk.c:2195
+msgid "You type"
+msgstr "You type"
+
+#: ../gtk/plugins/spellchk.c:2209
+msgid "You send"
+msgstr "You send"
+
+#: ../gtk/plugins/spellchk.c:2223
+msgid "Whole words only"
+msgstr "Whole words only"
+
+#: ../gtk/plugins/spellchk.c:2235
+msgid "Case sensitive"
+msgstr "Case sensitive"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "Add a new text replacement"
+msgstr "Add a new text replacement"
+
+#: ../gtk/plugins/spellchk.c:2277
+msgid "You _type:"
+msgstr "You _type:"
+
+#: ../gtk/plugins/spellchk.c:2294
+msgid "You _send:"
+msgstr "You _send:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2306
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_Exact case match (uncheck for automatic case handling)"
+
+#: ../gtk/plugins/spellchk.c:2308
+msgid "Only replace _whole words"
+msgstr "Only replace _whole words"
+
+#: ../gtk/plugins/spellchk.c:2333
+msgid "General Text Replacement Options"
+msgstr "General Text Replacement Options"
+
+#: ../gtk/plugins/spellchk.c:2334
+msgid "Enable replacement of last word on send"
+msgstr "Enable replacement of last word on send"
+
+#: ../gtk/plugins/spellchk.c:2359
+msgid "Text replacement"
+msgstr "Text replacement"
+
+#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Replaces text in outgoing messages according to user-defined rules."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Buddy Ticker"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "A horizontal scrolling version of the buddy list."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat Timestamp"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Delay"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minutes."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Timestamp"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "Adds iChat-style timestamps to conversations every N minutes."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Timestamp Format Options"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Force (traditional Gaim) 24-hour time format"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Show dates in..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversations"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "For delayed messages"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "For delayed messages and in chats"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "_Message Logs:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Customises the message timestamp formats."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"This plug-in allows the user to customize conversation and logging message "
+"timestamp formats."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Opacity:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "IM Conversation Windows"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_IM window transparency"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "_Show slider bar in IM window"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Remove IM window transparency on focus"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Always on top"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Buddy List Window"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Buddy List window transparency"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Remove Buddy List window transparency on focus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparency"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Variable Transparency for the buddy list and conversations."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"This plug-in enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plug-in requires Win2000 or greater."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime Version"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "Startup"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "_Start Gaim on Windows startup"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "_Dockable Buddy List"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "_Keep Buddy List window on top:"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "Only when docked"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "_Flash window when chat messages are received"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "WinGaim Options"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Options specific to Windows Gaim."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr "Provides options specific to Windows Gaim, such as buddy list docking."
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "accounts"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "Password is required to sign on."
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Enter password for %s (%s)"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "Save password"
+
+#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Missing protocol plug-in for %s"
+
+#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1295
+msgid "New passwords do not match."
+msgstr "New passwords do not match."
+
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "Fill out all fields completely."
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "Original password"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "New password"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "New password (again)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "Change password for %s"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "Please enter your current password and your new password."
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "Change user information for %s"
+
+#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Set User Info"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "buddy list"
+
+#: ../libgaim/blist.c:1919
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgstr[1] ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "Group not removed"
+
+#: ../libgaim/connection.c:106
+msgid "Registration Error"
+msgstr "Registration Error"
+
+#: ../libgaim/connection.c:292
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s signed on"
+
+#: ../libgaim/connection.c:325
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s signed off"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Unable to send message: The message is too large."
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Unable to send message to %s."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "The message is too large."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Unable to send message."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Send Message"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "_Send Message"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s entered the room."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] entered the room."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "You are now known as %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s left the room."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s left the room (%s)."
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "No name"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Failed to get connection: %s"
+
+#: ../libgaim/dbus-server.c:589
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Failed to get name: %s"
+
+#: ../libgaim/dbus-server.c:602
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Failed to get serv name: %s"
+
+#: ../libgaim/dnsquery.c:490
+msgid "Unable to create new resolver process\n"
+msgstr "Unable to create new resolver process\n"
+
+#: ../libgaim/dnsquery.c:495
+msgid "Unable to send request to resolver process\n"
+msgstr "Unable to send request to resolver process\n"
+
+#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Error resolving %s:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Error resolving %s: %d"
+
+#: ../libgaim/dnsquery.c:553
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Error reading from resolver process:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr "EOF while reading from resolver process"
+
+#: ../libgaim/dnsquery.c:734
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Thread creation failure: %s"
+
+#: ../libgaim/dnsquery.c:735
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../libgaim/ft.c:191 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:195
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Error writing %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:199
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Error accessing %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Directory is not writable."
+msgstr "Directory is not writable."
+
+#: ../libgaim/ft.c:245
+msgid "Cannot send a file of 0 bytes."
+msgstr "Cannot send a file of 0 bytes."
+
+#: ../libgaim/ft.c:255
+msgid "Cannot send a directory."
+msgstr "Cannot send a directory."
+
+#: ../libgaim/ft.c:264
+#, 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"
+
+#: ../libgaim/ft.c:322
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s wants to send you %s (%s)"
+
+#: ../libgaim/ft.c:329
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s wants to send you a file"
+
+#: ../libgaim/ft.c:370
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Accept file transfer request from %s?"
+
+#: ../libgaim/ft.c:374
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: ../libgaim/ft.c:407
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s is offering to send file %s"
+
+#: ../libgaim/ft.c:459
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s is not a valid filename.\n"
+
+#: ../libgaim/ft.c:480
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Offering to send %s to %s"
+
+#: ../libgaim/ft.c:492
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Starting transfer of %s from %s"
+
+#: ../libgaim/ft.c:646
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Transfer of file %s complete"
+
+#: ../libgaim/ft.c:649
+msgid "File transfer complete"
+msgstr "File transfer complete"
+
+#: ../libgaim/ft.c:1038
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
+
+#: ../libgaim/ft.c:1043
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: ../libgaim/ft.c:1101
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
+
+#: ../libgaim/ft.c:1106
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s cancelled the file transfer"
+
+#: ../libgaim/ft.c:1163
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "File transfer to %s failed."
+
+#: ../libgaim/ft.c:1165
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "File transfer from %s failed."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Run the command in a terminal"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "The command used to handle \"aim\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "The command used to handle \"gg\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "The command used to handle \"icq\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "The command used to handle \"irc\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "The command used to handle \"msnim\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "The command used to handle \"sip\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "The command used to handle \"xmpp\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "The command used to handle \"ymsgr\" URLs, if enabled."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "The handler for \"aim\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "The handler for \"gg\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "The handler for \"icq\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "The handler for \"irc\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "The handler for \"msnim\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "The handler for \"sip\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "The handler for \"xmpp\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "The handler for \"ymsgr\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Whether the specified command should handle \"aim\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Whether the specified command should handle \"gg\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Whether the specified command should handle \"icq\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Whether the specified command should handle \"irc\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Whether the specified command should handle \"msnim\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Whether the specified command should handle \"sip\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Whether the specified command should handle \"xmpp\" URLs"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Whether the specified command should handle \"ymsgr\" URLs"
+
+#: ../libgaim/log.c:181
 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>"
 
-#: ../src/log.c:549
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:560
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Plain text"
 
-#: ../src/log.c:571
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Old Gaim"
 
-#: ../src/log.c:666
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "Logging of this conversation failed."
 
-#: ../src/log.c:1009
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1077
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5304,7 +5932,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1079
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5313,40 +5941,47 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1136 ../src/log.c:1262
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: ../src/log.c:1148 ../src/log.c:1276
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, 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>"
 
-#: ../src/log.c:1205
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2679
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/plugin.c:424
+#: ../libgaim/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."
+
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Plug-in magic mismatch %d (need %d)"
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI version mismatch %d.%d.x (need %d.%d.x)"
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "Plug-in does not implement all required functions"
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:533
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5355,41 +5990,531 @@
 "The required plug-in %s was not found. Please install this plug-in and try "
 "again."
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Gaim encountered an error when loading the plug-in."
 
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plug-in %s could not be loaded."
 
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plug-in."
 
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "The dependent plug-in %s could not be unloaded."
 
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim encountered an error when unloading the plug-in."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus Example"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus Plug-in Example"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Gaim File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "Allows you to control Gaim by entering commands in a file."
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+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.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Set Account Idle Time"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Set"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "None of your accounts are idle."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Unset Account Idle Time"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Unset"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Set Idle Time for All Accounts"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Unset Idle Time For All Idled Accounts"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+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"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC Test Client"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Test plug-in IPC support, as a client."
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Test plug-in IPC support, as a client. This locates the server plug-in and "
+"calls the commands registered."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC Test Server"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Test plug-in IPC support, as a server."
+
+#. *  description
+#: ../libgaim/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."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "User is offline."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Auto-response sent:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s has signed off."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "One or more messages may not have been delivered."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "You were disconnected from the server."
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Message could not be sent because the maximum length was exceeded."
+
+#: ../libgaim/plugins/log_reader.c:1483
+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.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+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.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "General Log Reading Configuration"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Fast size calculations"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Use name heuristics"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Log Directory"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Log Reader"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Includes other IM clients' logs in the log viewer."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono Plug-in Loader"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Loads .NET plug-ins with Mono."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Perl Plug-in Loader"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Provides support for loading perl plug-ins."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Psychic Mode"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Psychic mode for incoming conversation"
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "You have a premonition..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Only enable for users on the buddy list"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Disable when away"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Display notification message in conversations"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Signals Test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "Test to see that all signals are working properly."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Simple Plug-in"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Tests to see that most things are working."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Provides a wrapper around SSL support libraries."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "Provides SSL support through GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Provides SSL support through Mozilla NSS."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s is no longer away."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s has gone away."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s has become idle."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s is no longer idle."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s has signed on."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Notify When"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "Buddy Goes _Away"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "Buddy Becomes _Idle"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Buddy _Signs On/Off"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Buddy State Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Tcl Plug-in Loader"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Provides support for loading Tcl plug-ins"
+
+#: ../libgaim/plugins/tcl/tcl.c:481
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"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
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Unable to listen for incoming IM connections\n"
 
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libgaim/protocols/bonjour/bonjour.c:146
 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?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3236
 #, c-format
 msgid ""
 "\n"
@@ -5398,7 +6523,7 @@
 "\n"
 "<b>Status:</b> %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5417,373 +6542,399 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:433
-#: ../src/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protocol Plug-in"
 
-#: ../src/protocols/bonjour/bonjour.c:471
-#: ../src/protocols/bonjour/bonjour.c:479
-#: ../src/protocols/bonjour/bonjour.c:537
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:300
 msgid "Gaim User"
 msgstr "Gaim User"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Hostname"
 
 #. Creating the options for the protocol
-#. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
-msgid "Port"
-msgstr "Port"
-
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:796
 msgid "First name"
 msgstr "Forename"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:801
 msgid "Last name"
 msgstr "Surname"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
-msgstr "Email"
-
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:590
+msgid "AIM Account"
+msgstr "AIM Account"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:593
+msgid "Jabber Account"
+msgstr "Jabber Account"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s has closed the conversation."
 
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Cannot open socket"
 
-#: ../src/protocols/bonjour/jabber.c:447
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Error setting socket options"
 
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
-msgstr "Cannot bind socket to port"
-
-#: ../src/protocols/bonjour/jabber.c:465
-msgid "Cannot listen on socket"
-msgstr "Cannot listen on socket"
-
-#: ../src/protocols/bonjour/jabber.c:559
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "Could not bind socket to port"
+
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Could not listen on socket"
+
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send the message: the conversation couldn't be started."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1777
+msgid "Invalid proxy settings"
+msgstr "Invalid proxy settings"
+
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1777
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Token Error"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Unable to fetch the token.\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Send Buddylist..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../libgaim/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."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Couldn't open file"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Buddylist saved successfully!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Couldn't load buddy list"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Load Buddylist..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Buddylist loaded successfully!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Save buddylist..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Fill in the registration fields."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Unable to register new account. Error occurred.\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "New Gadu-Gadu Account Registered"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registration completed successfully!"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/jabber/jabber.c:1330
 msgid "Password"
 msgstr "Password"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Password (retype)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Enter current token"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Current token"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Please fill in the following fields"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
-msgid "Unable to initiate a new search"
-msgstr "Unable to initiate a new search"
-
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "You have a pending search. Please wait for it to finish."
-
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#. General
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "City"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Year of birth"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Gender"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Male or female"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Male"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Female"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Only online"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Find buddies"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Please enter your search criteria below"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Fill in the fields."
 
-#: ../src/protocols/gg/gg.c:642
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Your current password is different from the one that you specified."
 
-#: ../src/protocols/gg/gg.c:656
-msgid "Unable to change password. Error occured.\n"
+#: ../libgaim/protocols/gg/gg.c:716
+msgid "Unable to change password. Error occurred.\n"
 msgstr "Unable to change password. An error occured.\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Change password for the Gadu-Gadu account"
 
-#: ../src/protocols/gg/gg.c:666
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Password successfully changed!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Current password"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Change Gadu-Gadu password"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Select a chat for buddy: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
-#: ../src/protocols/gg/gg.c:950
-msgid "No matching users found"
-msgstr "No matching users found"
-
-#: ../src/protocols/gg/gg.c:951
-msgid "There are no users matching your search criteria."
-msgstr "There are no users matching your search criteria."
-
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/oscar/oscar.c:6329
-msgid "Unable to display the search results."
-msgstr "Unable to display the search results."
-
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3621
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:980
-msgid "Birth year"
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3632
+#: ../libgaim/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "Forename"
+
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+msgid "Birth Year"
 msgstr "Year of birth"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3796
+msgid "Unable to display the search results."
+msgstr "Unable to display the search results."
+
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Public Directory"
 
-#: ../src/protocols/gg/gg.c:1021
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Search results"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../libgaim/protocols/gg/gg.c:1196
+msgid "No matching users found"
+msgstr "No matching users found"
+
+#: ../libgaim/protocols/gg/gg.c:1197
+msgid "There are no users matching your search criteria."
+msgstr "There are no users matching your search criteria."
+
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
 
-#: ../src/protocols/gg/gg.c:1202
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "Your buddy list was downloaded from the server."
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Buddy list uploaded"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Connection failed."
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Blocked"
 
-#: ../src/protocols/gg/gg.c:1468
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Add to chat"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Unblock"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Block"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Chat error"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-#: ../src/protocols/gg/gg.c:1808
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "Not connected to the server."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Find buddies..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Change password..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Upload buddylist to Server"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Download buddylist from Server"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Delete buddylist from Server"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Save buddylist to file..."
 
-#: ../src/protocols/gg/gg.c:1859
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
@@ -5798,119 +6949,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plug-in"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Polish popular IM system"
 
-#: ../src/protocols/gg/gg.c:2004
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
-#: ../src/protocols/yahoo/yahoo_filexfer.c:252
-#: ../src/protocols/yahoo/yahoo_filexfer.c:261
-#: ../src/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
+#: ../libgaim/protocols/jabber/jabber.c:916
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
 msgstr "Read error"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
-#: ../src/protocols/yahoo/yahoochat.c:1430
+#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Users"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1439
+#: ../libgaim/protocols/irc/irc.c:772
+#: ../libgaim/protocols/sametime/sametime.c:3347
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Topic"
 
@@ -5922,37 +7076,49 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:902
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plug-in"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plug-in that Sucks Less"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
+#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1961
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6533
+#: ../libgaim/protocols/qq/qq.c:1031
+#: ../libgaim/protocols/sametime/sametime.c:5629
+#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
+#: ../libgaim/protocols/simple/simple.c:1835
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Server"
 
-#: ../src/protocols/irc/irc.c:903
+#. port to connect to
+#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6536 ../libgaim/protocols/qq/qq.c:1034
+#: ../libgaim/protocols/sametime/sametime.c:5634
+#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
+msgid "Port"
+msgstr "Port"
+
+#: ../libgaim/protocols/irc/irc.c:928
 msgid "Encodings"
 msgstr "Encodings"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:933
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:771
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
+#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
+#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Username"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Real name"
 
@@ -5960,164 +7126,163 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:942
 msgid "Use SSL"
 msgstr "Use SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Banned"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Cannot ban %s: banlist is full"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3622
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "Realname"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Currently on"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Online since"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: ../src/protocols/irc/msgs.c:318
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: ../src/protocols/irc/msgs.c:325
+#: ../libgaim/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s has cleared the topic."
+
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: ../src/protocols/irc/msgs.c:343
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: ../src/protocols/irc/msgs.c:367
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: ../src/protocols/irc/msgs.c:495
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Time Response"
 
-#: ../src/protocols/irc/msgs.c:496
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "no such channel"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: ../src/protocols/irc/msgs.c:526
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: ../src/protocols/irc/msgs.c:546
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Could not send"
 
-#: ../src/protocols/irc/msgs.c:602
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: ../src/protocols/irc/msgs.c:603
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: ../src/protocols/irc/msgs.c:704
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:732
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../libgaim/protocols/irc/msgs.c:841
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6125,7 +7290,7 @@
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6133,51 +7298,51 @@
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: ../src/protocols/irc/msgs.c:926
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: ../src/protocols/irc/msgs.c:928
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: ../src/protocols/irc/msgs.c:1003
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: ../src/protocols/irc/msgs.c:1038
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick or channel is temporarily unavailable."
 
-#: ../src/protocols/irc/msgs.c:1050
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: ../src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:117
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -6185,11 +7350,11 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Send a command to chanserv"
 
-#: ../src/protocols/irc/parse.c:117
+#: ../libgaim/protocols/irc/parse.c:119
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -6197,7 +7362,7 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:120
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -6207,7 +7372,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -6215,7 +7380,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: ../src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6223,7 +7388,7 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -6231,7 +7396,7 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -6239,7 +7404,7 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:125
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -6247,15 +7412,15 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Send a command to memoserv"
 
-#: ../src/protocols/irc/parse.c:126
+#: ../libgaim/protocols/irc/parse.c:128
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -6263,7 +7428,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 
-#: ../src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:129
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6271,19 +7436,20 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1766
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Send a command to nickserv"
 
-#: ../src/protocols/irc/parse.c:131
+#: ../libgaim/protocols/irc/parse.c:133
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -6291,7 +7457,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:134
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -6299,11 +7465,11 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Send a command to operserv"
 
-#: ../src/protocols/irc/parse.c:134
+#: ../libgaim/protocols/irc/parse.c:136
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -6311,7 +7477,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: ../src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:137
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -6319,7 +7485,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: ../src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:138
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -6327,15 +7493,15 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: ../src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:141
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -6343,19 +7509,23 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Displays the current local time at the IRC server."
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 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."
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: send CTCP VERSION request to a user"
+
+#: ../libgaim/protocols/irc/parse.c:146
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -6363,7 +7533,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: ../src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:147
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -6371,58 +7541,53 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: ../src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  Get information on a user."
 
-#: ../src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-
-#: ../src/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "Server couldn't authenticate you without a password"
 
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -6430,98 +7595,126 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
 #. This should never happen!
-#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "SASL error"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
-#: ../src/protocols/silc/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:831
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Street Address"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "Locality"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "Region"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Postal Code"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "Country"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Role"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3665
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6529,602 +7722,678 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
+#: ../libgaim/protocols/jabber/buddy.c:640
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
+msgid "Operating System"
+msgstr "Operating System"
+
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Resource"
 msgstr "Resource"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1204
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+msgid "Priority"
+msgstr "Priority"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Client"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:806
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Address"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Photo"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Error"
-
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1213
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
-#: ../src/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5656
+#: ../libgaim/protocols/sametime/sametime.c:3270
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../libgaim/protocols/jabber/buddy.c:1520
+msgid "JID"
+msgstr "JID"
+
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3633
+msgid "Last Name"
+msgstr "Surname"
+
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
-#: ../src/protocols/jabber/buddy.c:1388
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libgaim/protocols/jabber/buddy.c:1631
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+
+#: ../libgaim/protocols/jabber/buddy.c:1651
+msgid "Directory Query Failed"
+msgstr "Directory Query Failed"
+
+#: ../libgaim/protocols/jabber/buddy.c:1652
+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[])
+#: ../libgaim/protocols/jabber/buddy.c:1686
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Server Instructions: %s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Fill in one or more fields to search for any matching Jabber users."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "Forename"
-
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
-msgid "Last Name"
-msgstr "Surname"
-
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3635
+#: ../libgaim/protocols/oscar/oscar.c:3642
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Search for Jabber users"
 
-#: ../src/protocols/jabber/buddy.c:1431
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Invalid Directory"
 
-#: ../src/protocols/jabber/buddy.c:1448
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Enter a User Directory"
 
-#: ../src/protocols/jabber/buddy.c:1449
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Select a user directory to search"
 
-#: ../src/protocols/jabber/buddy.c:1452
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Search Directory"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
-#: ../src/protocols/yahoo/yahoochat.c:998
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5139
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Room:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: ../src/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registration error"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
-#: ../src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Write error"
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Read Error"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../libgaim/protocols/jabber/jabber.c:493
+#: ../libgaim/protocols/jabber/jabber.c:924
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../libgaim/protocols/jabber/jabber.c:541
+#: ../libgaim/protocols/jabber/jabber.c:884
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../libgaim/protocols/jabber/jabber.c:612
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../libgaim/protocols/jabber/jabber.c:614
+#: ../libgaim/protocols/jabber/jabber.c:615
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:621
+#: ../libgaim/protocols/jabber/jabber.c:1479
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libgaim/protocols/jabber/jabber.c:624
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../libgaim/protocols/jabber/jabber.c:739
+#: ../libgaim/protocols/jabber/jabber.c:740
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../libgaim/protocols/jabber/jabber.c:816
+#: ../libgaim/protocols/oscar/oscar.c:3686
+#: ../libgaim/protocols/oscar/oscar.c:3694
 msgid "State"
 msgstr "County/State"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
+#: ../libgaim/protocols/jabber/jabber.c:821
+msgid "Postal code"
+msgstr "Postcode"
+
+#: ../libgaim/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Telephone"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/jabber/jabber.c:836
 msgid "Date"
 msgstr "Date"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../libgaim/protocols/jabber/jabber.c:844
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../libgaim/protocols/jabber/jabber.c:1004
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../libgaim/protocols/jabber/jabber.c:1018
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
+#: ../libgaim/protocols/jabber/jabber.c:1092
+#: ../libgaim/protocols/jabber/jabber.c:1457
+#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5445
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: ../src/protocols/jabber/jabber.c:1110
+#: ../libgaim/protocols/jabber/jabber.c:1134
 msgid "Both"
 msgstr "Both"
 
-#: ../src/protocols/jabber/jabber.c:1112
+#: ../libgaim/protocols/jabber/jabber.c:1136
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../src/protocols/jabber/jabber.c:1117
+#: ../libgaim/protocols/jabber/jabber.c:1141
 msgid "To"
 msgstr "To"
 
-#: ../src/protocols/jabber/jabber.c:1119
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../libgaim/protocols/jabber/jabber.c:1147
 msgid "Subscription"
 msgstr "Subscription"
 
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
-msgid "Priority"
-msgstr "Priority"
-
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../libgaim/protocols/jabber/jabber.c:1273
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../libgaim/protocols/jabber/jabber.c:1274
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
+#: ../libgaim/protocols/jabber/jabber.c:1278
+#: ../libgaim/protocols/jabber/jabber.c:1279
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: ../src/protocols/jabber/jabber.c:1311
+#: ../libgaim/protocols/jabber/jabber.c:1335
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
+#: ../libgaim/protocols/jabber/jabber.c:1340
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
-#: ../src/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/oscar/oscar.c:6247
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
-#: ../src/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1356
+#: ../libgaim/protocols/oscar/oscar.c:6258
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Change Password..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Search for Users..."
 msgstr "Search for Users..."
 
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../libgaim/protocols/jabber/jabber.c:1437
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../src/protocols/jabber/jabber.c:1415
+#: ../libgaim/protocols/jabber/jabber.c:1439
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../libgaim/protocols/jabber/jabber.c:1441
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../libgaim/protocols/jabber/jabber.c:1443
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../libgaim/protocols/jabber/jabber.c:1445
 msgid "Gone"
 msgstr "Gone"
 
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../libgaim/protocols/jabber/jabber.c:1449
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../libgaim/protocols/jabber/jabber.c:1451
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../libgaim/protocols/jabber/jabber.c:1453
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../libgaim/protocols/jabber/jabber.c:1455
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: ../src/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:1492
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: ../src/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: ../src/protocols/jabber/jabber.c:1476
+#: ../libgaim/protocols/jabber/jabber.c:1500
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: ../src/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1503
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../libgaim/protocols/jabber/jabber.c:1507
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: ../src/protocols/jabber/jabber.c:1485
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: ../src/protocols/jabber/jabber.c:1488
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: ../src/protocols/jabber/jabber.c:1494
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../libgaim/protocols/jabber/jabber.c:1520
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../libgaim/protocols/jabber/jabber.c:1524
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../libgaim/protocols/jabber/jabber.c:1526
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../libgaim/protocols/jabber/jabber.c:1528
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../libgaim/protocols/jabber/jabber.c:1530
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: ../src/protocols/jabber/jabber.c:1512
+#: ../libgaim/protocols/jabber/jabber.c:1536
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1554
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: ../src/protocols/jabber/jabber.c:1599
+#: ../libgaim/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: ../src/protocols/jabber/jabber.c:1619
+#: ../libgaim/protocols/jabber/jabber.c:1643
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unknown affiliation: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1624
+#: ../libgaim/protocols/jabber/jabber.c:1648
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Unable to affiliate user %s as \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1643
+#: ../libgaim/protocols/jabber/jabber.c:1667
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unknown role: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../libgaim/protocols/jabber/jabber.c:1674
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Unable to set role \"%s\" for user: %s"
 
-#: ../src/protocols/jabber/jabber.c:1703
+#: ../libgaim/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../libgaim/protocols/jabber/jabber.c:1758
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../libgaim/protocols/jabber/jabber.c:1762
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: ../src/protocols/jabber/jabber.c:1752
+#: ../libgaim/protocols/jabber/jabber.c:1776
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: ../src/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1782
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: ../src/protocols/jabber/jabber.c:1764
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: ../src/protocols/jabber/jabber.c:1770
+#: ../libgaim/protocols/jabber/jabber.c:1794
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7132,7 +8401,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1800
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7140,19 +8409,19 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 
-#: ../src/protocols/jabber/jabber.c:1782
+#: ../libgaim/protocols/jabber/jabber.c:1806
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
 
-#: ../src/protocols/jabber/jabber.c:1788
+#: ../libgaim/protocols/jabber/jabber.c:1812
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: ../src/protocols/jabber/jabber.c:1794
+#: ../libgaim/protocols/jabber/jabber.c:1818
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: ../src/protocols/jabber/jabber.c:1799
+#: ../libgaim/protocols/jabber/jabber.c:1823
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7168,93 +8437,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
+#: ../libgaim/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1941
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plug-in"
 
-#: ../src/protocols/jabber/jabber.c:1910
-msgid "Use TLS if available"
-msgstr "Use TLS if available"
-
-#: ../src/protocols/jabber/jabber.c:1915
-msgid "Require TLS"
-msgstr "Require TLS"
-
-#: ../src/protocols/jabber/jabber.c:1918
+#: ../libgaim/protocols/jabber/jabber.c:1967
 msgid "Force old (port 5223) SSL"
 msgstr "Force old (port 5223) SSL"
 
-#: ../src/protocols/jabber/jabber.c:1923
+#: ../libgaim/protocols/jabber/jabber.c:1972
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
+#: ../libgaim/protocols/jabber/jabber.c:1977
+#: ../libgaim/protocols/simple/simple.c:1841
 msgid "Connect port"
 msgstr "Connect port"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
+#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "Connect server"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: ../src/protocols/jabber/message.c:300
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "The user %s wants to add %s to his or her buddy list."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5070
 msgid "_Authorize"
 msgstr "_Authorise"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2361
+#: ../libgaim/protocols/oscar/oscar.c:5071
 msgid "_Deny"
 msgstr "_Deny"
 
-#: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: ../src/protocols/jabber/presence.c:383
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7262,39 +8529,39 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Configure Room"
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: ../src/protocols/jabber/si.c:727
+#: ../libgaim/protocols/jabber/si.c:765
 #, 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"
 
-#: ../src/protocols/jabber/si.c:728 ../src/protocols/jabber/si.c:729
+#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Buddy list synchronisation issue in %s (%s)"
 
-#: ../src/protocols/msn/dialog.c:98
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7303,7 +8570,7 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 
-#: ../src/protocols/msn/dialog.c:106
+#: ../libgaim/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 "
@@ -7312,263 +8579,266 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntax Error (probably a Gaim bug)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Invalid e-mail address"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Already Logged In"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Invalid Username"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Invalid Friendly Name"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "List Full"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Already there"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Not on list"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "User is offline"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "User not in group"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#: ../src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 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"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Notify Transfer failed"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Service Temporarily Unavailable"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Database server error"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "File operation error"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Server busy"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Peer Notification server down"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Session overload"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "User is too active"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Not expected"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1312
+#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unknown Error Code %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "You have just sent a Nudge!"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
 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."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Set your home telephone number."
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Set your work telephone number."
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: ../src/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:307
 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?"
@@ -7576,29 +8846,31 @@
 "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?"
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Allow"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Disallow"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "This Hotmail account may not be active."
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Page"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3232
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -7607,69 +8879,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Has you"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Set Home Telephone Number..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Set Work Telephone Number..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Set Mobile Phone Number..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Enable/Disable Mobile Devices..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Allow/Disallow Mobile Pages..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail Inbox"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../libgaim/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7677,85 +8953,239 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3671
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Age"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Location"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
+#: ../libgaim/protocols/msn/msn.c:1557
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>General</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../libgaim/protocols/msn/msn.c:1567
+msgid "Interests"
+msgstr "Interests"
+
+#: ../libgaim/protocols/msn/msn.c:1568
+msgid "Pets"
+msgstr "Pets"
+
+#: ../libgaim/protocols/msn/msn.c:1569
+msgid "Hometown"
+msgstr "Home town"
+
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Places Lived"
+msgstr "Places Lived"
+
+#: ../libgaim/protocols/msn/msn.c:1571
+msgid "Fashion"
+msgstr "Fashion"
+
+#: ../libgaim/protocols/msn/msn.c:1572
+msgid "Humor"
+msgstr "Humour"
+
+#: ../libgaim/protocols/msn/msn.c:1573
+msgid "Music"
+msgstr "Music"
+
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+#: ../libgaim/protocols/msn/msn.c:1578
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Social</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1587
+msgid "Significant Other"
+msgstr "Partner"
+
+#: ../libgaim/protocols/msn/msn.c:1588
+msgid "Home Phone"
+msgstr "Home Telephone"
+
+#: ../libgaim/protocols/msn/msn.c:1589
+msgid "Home Phone 2"
+msgstr "Home Telephone 2"
+
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3683
+msgid "Home Address"
+msgstr "Home Address"
+
+#: ../libgaim/protocols/msn/msn.c:1591
+msgid "Personal Mobile"
+msgstr "Personal Mobile"
+
+#: ../libgaim/protocols/msn/msn.c:1592
+msgid "Home Fax"
+msgstr "Home Fax"
+
+#: ../libgaim/protocols/msn/msn.c:1593
+msgid "Personal E-Mail"
+msgstr "Personal E-mail"
+
+#: ../libgaim/protocols/msn/msn.c:1594
+msgid "Personal IM"
+msgstr "Personal IM"
+
+#: ../libgaim/protocols/msn/msn.c:1596
+msgid "Anniversary"
+msgstr "Anniversary"
+
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
+msgid "Notes"
+msgstr "Notes"
+
+#: ../libgaim/protocols/msn/msn.c:1601
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Personal</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Job Title"
+
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3700
+msgid "Company"
+msgstr "Company"
+
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Department"
+
+#: ../libgaim/protocols/msn/msn.c:1612
+msgid "Profession"
+msgstr "Profession"
+
+#: ../libgaim/protocols/msn/msn.c:1613
+msgid "Work Phone"
+msgstr "Work Telephone"
+
+#: ../libgaim/protocols/msn/msn.c:1614
+msgid "Work Phone 2"
+msgstr "Work Telephone 2"
+
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3691
+msgid "Work Address"
+msgstr "Work Address"
+
+#: ../libgaim/protocols/msn/msn.c:1616
+msgid "Work Mobile"
+msgstr "Work Mobile"
+
+#: ../libgaim/protocols/msn/msn.c:1617
+msgid "Work Pager"
+msgstr "Work Pager"
+
+#: ../libgaim/protocols/msn/msn.c:1618
+msgid "Work Fax"
+msgstr "Work Fax"
+
+#: ../libgaim/protocols/msn/msn.c:1619
+msgid "Work E-Mail"
+msgstr "Work E-mail"
+
+#: ../libgaim/protocols/msn/msn.c:1620
+msgid "Work IM"
+msgstr "Work IM"
+
+#: ../libgaim/protocols/msn/msn.c:1621
+msgid "Start Date"
+msgstr "Start Date"
+
+#: ../libgaim/protocols/msn/msn.c:1626
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Business</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1637
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Contact Info</b>%s%s"
+
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: ../src/protocols/msn/msn.c:1765
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../src/protocols/msn/msn.c:1802
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: ../src/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1799
 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 "
@@ -7765,7 +9195,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: ../src/protocols/msn/msn.c:1807
+#: ../libgaim/protocols/msn/msn.c:1803
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7773,8 +9203,14 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../libgaim/protocols/msn/msn.c:1808
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "Profile URL"
 
@@ -7788,85 +9224,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plug-in"
 
-#: ../src/protocols/msn/msn.c:2043
-msgid "Login server"
-msgstr "Login server"
-
-#: ../src/protocols/msn/msn.c:2052
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: ../src/protocols/msn/msn.c:2057
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
-#: ../src/protocols/msn/msn.c:2065
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s is not a valid group."
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s on %s (%s)"
 
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Unable to add user on %s (%s)"
 
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Unable to block user on %s (%s)"
 
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Unable to permit user on %s (%s)"
 
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/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."
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is not a valid passport account."
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Service Temporarily Unavailable."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7897,15 +9344,15 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Writing error"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Reading error"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7914,292 +9361,227 @@
 "Connection error from %s server:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Our protocol is not supported by the server."
 
-#: ../src/protocols/msn/session.c:308
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Error parsing HTTP."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3411
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/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."
 
-#: ../src/protocols/msn/session.c:320
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Unable to authenticate: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/session.c:324
 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."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/protocols/msn/session.c:353
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Starting authentication"
 
-#: ../src/protocols/msn/session.c:354
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Getting cookie"
 
-#: ../src/protocols/msn/session.c:356
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Sending cookie"
 
-#: ../src/protocols/msn/session.c:357
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../libgaim/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:"
 
-#: ../src/protocols/msn/switchboard.c:416
+#: ../libgaim/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:"
 
-#: ../src/protocols/msn/switchboard.c:420
+#: ../libgaim/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:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../libgaim/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:"
 
-#: ../src/protocols/msn/switchboard.c:428
+#: ../libgaim/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:"
 
-#: ../src/protocols/msn/switchboard.c:432
+#: ../libgaim/protocols/msn/switchboard.c:424
 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:"
 
-#: ../src/protocols/msn/switchboard.c:440
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s just sent you a Nudge!"
 
-#: ../src/protocols/msn/userlist.c:96
+#: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "The user %s (%s) wants to add %s to his or her buddy list."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Authorise"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Deny"
 
-#: ../src/protocols/msn/userlist.c:286
+#: ../libgaim/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s has added you to his or her buddy list."
 
-#: ../src/protocols/msn/userlist.c:350
+#: ../libgaim/protocols/msn/userlist.c:349
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s has removed you from his or her boddy list."
 
-#: ../src/protocols/msn/userlist.c:678
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Unable to add \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "The screen name specified is invalid."
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Unable to read header from server"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"Unable to read message from server: %s.  Command is %hd, length is %hd."
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Unknown server error."
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "users: %s, files: %s, size: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "Unable to add \"%s\" to your Napster hotlist"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s requested your information"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s requested a PING"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Group:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER Protocol Plug-in"
-
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "Required parameters not passed in"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "Unable to write to network"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "Unable to read from network"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "Error communicating with server"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "Conference not found"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "Conference does not exist"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "A folder with that name already exists"
 
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "Password has expired"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "User not found"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "The server could not access the directory"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "Your system administrator has disabled this operation"
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "The server is unavailable; try again later"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Cannot add a contact to the same folder twice"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "Cannot add yourself"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
 msgstr "Invalid username or password"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libgaim/protocols/novell/nmuser.c:1943
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -8207,31 +9589,31 @@
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "You cannot add the same person twice to a conversation"
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "You have reached your limit for the number of contacts allowed"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
 msgstr "You have entered an invalid username"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "An error occurred while updating the directory"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "Incompatible protocol version"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "The user has blocked you"
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1965
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8239,52 +9621,53 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "The user is either offline or you are blocked"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/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?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
 
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8293,7 +9676,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: ../src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8302,67 +9685,61 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/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)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Unable to change server side privacy settings (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Department"
-
-#: ../src/protocols/novell/novell.c:1484
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Email Address"
-
-#: ../src/protocols/novell/novell.c:1506
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "User ID"
 
@@ -8373,41 +9750,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Full name"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8418,15 +9795,16 @@
 "\n"
 "Sent: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: ../src/protocols/novell/novell.c:2014
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 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."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8438,7 +9816,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8446,11 +9824,11 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -8464,115 +9842,195 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plug-in"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "Server address"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Server port"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
+#: ../libgaim/proxy.c:1413
+msgid "Server closed the connection."
+msgstr "Server closed the connection."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
+#: ../libgaim/proxy.c:1425
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Lost connection with server:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
+#: ../libgaim/proxy.c:1438
+msgid "Received invalid data on connection with server."
+msgstr "Received invalid data on connection with server."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Could not establish a connection with the server:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "The remote user has closed the connection."
+
+#: ../libgaim/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "The remote user has declined your request."
+
+#: ../libgaim/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"
+
+#: ../libgaim/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr "Received invalid data on connection with remote user."
+
+#: ../libgaim/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."
+
+#: ../libgaim/protocols/oscar/odc.c:561
+msgid "Direct IM established"
+msgstr "Direct IM established"
+
+#: ../libgaim/protocols/oscar/oft.c:457
+#, 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."
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: ../src/protocols/oscar/oscar.c:208
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: ../src/protocols/oscar/oscar.c:216
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Request denied"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: ../src/protocols/oscar/oscar.c:220
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: ../src/protocols/oscar/oscar.c:221
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: ../src/protocols/oscar/oscar.c:222
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: ../src/protocols/oscar/oscar.c:223
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "No match"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "List overflow"
 
-#: ../src/protocols/oscar/oscar.c:225
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: ../src/protocols/oscar/oscar.c:226
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Queue full"
 
-#: ../src/protocols/oscar/oscar.c:227
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+#: ../libgaim/protocols/oscar/oscar.c:321
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8580,183 +10038,156 @@
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: ../src/protocols/oscar/oscar.c:702
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Voice"
 
-#: ../src/protocols/oscar/oscar.c:705
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5854
 msgid "Get File"
 msgstr "Get File"
 
-#: ../src/protocols/oscar/oscar.c:718
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Games"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../src/protocols/oscar/oscar.c:724
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: ../src/protocols/oscar/oscar.c:727
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: ../src/protocols/oscar/oscar.c:730
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "AP User"
 
-#: ../src/protocols/oscar/oscar.c:733
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:736
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../src/protocols/oscar/oscar.c:739
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../src/protocols/oscar/oscar.c:742
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:745
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: ../src/protocols/oscar/oscar.c:748
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:751
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:754
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: ../src/protocols/oscar/oscar.c:757
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../src/protocols/oscar/oscar.c:761
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:764
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../src/protocols/oscar/oscar.c:767
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Camera"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5631
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5663
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5649
 msgid "Occupied"
 msgstr "Occupied"
 
-#: ../src/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../src/protocols/oscar/oscar.c:799
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "Online"
 
-#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2806
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: ../src/protocols/oscar/oscar.c:885
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: ../src/protocols/oscar/oscar.c:1034
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "Direct IM with %s closed"
-
-#: ../src/protocols/oscar/oscar.c:1036
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "Direct IM with %s failed"
-
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "Direct Connect failed"
-
-#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Direct IM with %s established"
-
-#: ../src/protocols/oscar/oscar.c:1205
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
-
-#: ../src/protocols/oscar/oscar.c:1608
-#, 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."
-
-#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "Unable to open Direct IM"
-
-#: ../src/protocols/oscar/oscar.c:1696
-#, 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."
-
-#: ../src/protocols/oscar/oscar.c:1700
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-
-#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "_Connect"
-
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "You have lost your connection to chat room %s."
-
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "Chat is currently unavailable"
-
-#: ../src/protocols/oscar/oscar.c:1877
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Could not connect to authentication server:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"Could not connect to BOS server:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../libgaim/protocols/oscar/oscar.c:984
+msgid "Connection established, cookie sent"
+msgstr "Connection established, cookie sent"
+
+#. TODO: Don't call this with ssi
+#: ../libgaim/protocols/oscar/oscar.c:1013
+msgid "Finalizing connection"
+msgstr "Finalising connection"
+
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8767,79 +10198,25 @@
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "Unable to login to AIM"
-
-#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "Connection established, cookie sent"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-msgid "Attempting connection redirect..."
-msgstr "Attempting connection redirect..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "Unable to establish file descriptor."
-
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "Unable to create new connection."
-
-#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "Unable to log into file transfer proxy."
-
-#: ../src/protocols/oscar/oscar.c:2668
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"Unable to establish listener socket or no AOL proxy connection present."
-
-#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Incorrect nickname or password."
-
-#: ../src/protocols/oscar/oscar.c:2911
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Invalid screen name."
+
+#: ../libgaim/protocols/oscar/oscar.c:1289
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Incorrect password."
+
+#: ../libgaim/protocols/oscar/oscar.c:1294
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
+#: ../libgaim/protocols/oscar/oscar.c:1298
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: ../src/protocols/oscar/oscar.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:1303
 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."
@@ -8847,33 +10224,33 @@
 "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."
 
-#: ../src/protocols/oscar/oscar.c:2925
+#: ../libgaim/protocols/oscar/oscar.c:1308
 #, 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"
 
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "Internal Error"
-
-#: ../src/protocols/oscar/oscar.c:3023
+#: ../libgaim/protocols/oscar/oscar.c:1343
+msgid "Could Not Connect"
+msgstr "Could Not Connect"
+
+#: ../libgaim/protocols/oscar/oscar.c:1348
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: ../src/protocols/oscar/oscar.c:3047
+#: ../libgaim/protocols/oscar/oscar.c:1371
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: ../src/protocols/oscar/oscar.c:3061
+#: ../libgaim/protocols/oscar/oscar.c:1385
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: ../src/protocols/oscar/oscar.c:3062
+#: ../libgaim/protocols/oscar/oscar.c:1386
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Enter the 6 digit number from the digital display."
 
-#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
+#: ../libgaim/protocols/oscar/oscar.c:1426
+#: ../libgaim/protocols/oscar/oscar.c:1469
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8882,46 +10259,41 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
+#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libgaim/protocols/oscar/oscar.c:1472
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim was unable to get a valid AIM login hash."
 
-#: ../src/protocols/oscar/oscar.c:3226
+#: ../libgaim/protocols/oscar/oscar.c:1558
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "You may be disconnected shortly.  Check %s for updates."
+
+#: ../libgaim/protocols/oscar/oscar.c:1561
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim was unable to get a valid login hash."
 
-#: ../src/protocols/oscar/oscar.c:3247
+#: ../libgaim/protocols/oscar/oscar.c:1587
 msgid "Password sent"
 msgstr "Password sent"
 
-#: ../src/protocols/oscar/oscar.c:4555
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s has just asked to directly connect to %s"
-
-#: ../src/protocols/oscar/oscar.c:4558
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-
-#: ../src/protocols/oscar/oscar.c:4597
+#: ../libgaim/protocols/oscar/oscar.c:1643
+msgid "Unable to initialize connection"
+msgstr "Unable to initialise connection"
+
+#: ../libgaim/protocols/oscar/oscar.c:2141
 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."
 
-#: ../src/protocols/oscar/oscar.c:4605
+#: ../libgaim/protocols/oscar/oscar.c:2150
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../libgaim/protocols/oscar/oscar.c:2151
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: ../src/protocols/oscar/oscar.c:4636
+#: ../libgaim/protocols/oscar/oscar.c:2183
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8930,25 +10302,28 @@
 "The user %s requires authorisation before being added to a buddy list.  Do "
 "you want to send an authorisation request?"
 
-#: ../src/protocols/oscar/oscar.c:4641
+#: ../libgaim/protocols/oscar/oscar.c:2188
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: ../src/protocols/oscar/oscar.c:4643
+#: ../libgaim/protocols/oscar/oscar.c:2190
 msgid "_Request Authorization"
 msgstr "_Request Authorisation"
 
-#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
+#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:2345
+#: ../libgaim/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:5056
+#: ../libgaim/protocols/oscar/oscar.c:5108
 msgid "No reason given."
 msgstr "No reason given."
 
-#: ../src/protocols/oscar/oscar.c:4686
+#: ../libgaim/protocols/oscar/oscar.c:2237
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: ../src/protocols/oscar/oscar.c:4793
+#: ../libgaim/protocols/oscar/oscar.c:2347
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8957,11 +10332,12 @@
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: ../src/protocols/oscar/oscar.c:4815
+#: ../libgaim/protocols/oscar/oscar.c:2369
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8972,17 +10348,17 @@
 "following reason:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4816
+#: ../libgaim/protocols/oscar/oscar.c:2370
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
+#: ../libgaim/protocols/oscar/oscar.c:2377
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:4831
+#: ../libgaim/protocols/oscar/oscar.c:2385
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8995,7 +10371,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../libgaim/protocols/oscar/oscar.c:2393
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9008,7 +10384,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../libgaim/protocols/oscar/oscar.c:2401
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9021,34 +10397,34 @@
 "Message is:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../libgaim/protocols/oscar/oscar.c:2422
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:4874
+#: ../libgaim/protocols/oscar/oscar.c:2428
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: ../src/protocols/oscar/oscar.c:4878
+#: ../libgaim/protocols/oscar/oscar.c:2432
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/protocols/oscar/oscar.c:4962
+#: ../libgaim/protocols/oscar/oscar.c:2516
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:2525
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:4980
+#: ../libgaim/protocols/oscar/oscar.c:2534
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9059,87 +10435,89 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: ../src/protocols/oscar/oscar.c:4989
+#: ../libgaim/protocols/oscar/oscar.c:2543
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:4998
+#: ../libgaim/protocols/oscar/oscar.c:2552
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:5007
+#: ../libgaim/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#: ../src/protocols/oscar/oscar.c:5066
+#: ../libgaim/protocols/oscar/oscar.c:2617
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:5127
+#: ../libgaim/protocols/oscar/oscar.c:2678
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
+#: ../libgaim/protocols/oscar/oscar.c:2714
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
+#: ../libgaim/protocols/oscar/oscar.c:2714
+#: ../libgaim/protocols/oscar/oscar.c:2719
+#: ../libgaim/protocols/oscar/oscar.c:2781
+#: ../libgaim/protocols/oscar/oscar.c:2785
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/sametime/sametime.c:2360
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: ../src/protocols/oscar/oscar.c:5227
+#: ../libgaim/protocols/oscar/oscar.c:2781
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: ../src/protocols/oscar/oscar.c:5230
+#: ../libgaim/protocols/oscar/oscar.c:2784
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: ../src/protocols/oscar/oscar.c:5257
+#: ../libgaim/protocols/oscar/oscar.c:2810
 msgid "Online Since"
 msgstr "Online Since"
 
-#: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../libgaim/protocols/oscar/oscar.c:2815
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../libgaim/protocols/oscar/oscar.c:2820
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: ../src/protocols/oscar/oscar.c:5285
+#: ../libgaim/protocols/oscar/oscar.c:2838
 msgid "Available Message"
 msgstr "Available Message"
 
-#: ../src/protocols/oscar/oscar.c:5402
+#: ../libgaim/protocols/oscar/oscar.c:2938
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
+#: ../libgaim/protocols/oscar/oscar.c:3119
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9147,11 +10525,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: ../src/protocols/oscar/oscar.c:5809
+#: ../libgaim/protocols/oscar/oscar.c:3340
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: ../src/protocols/oscar/oscar.c:5810
+#: ../libgaim/protocols/oscar/oscar.c:3341
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9159,94 +10537,84 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: ../src/protocols/oscar/oscar.c:5883
+#: ../libgaim/protocols/oscar/oscar.c:3413
 msgid "You have been signed off for an unknown reason."
 msgstr "You have been signed off for an unknown reason."
 
-#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3426 ../libgaim/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."
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "Finalising connection"
-
-#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../src/protocols/oscar/oscar.c:6207
+#: ../libgaim/protocols/oscar/oscar.c:3674
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../libgaim/protocols/oscar/oscar.c:3678
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Home Address"
-
-#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
+#: ../libgaim/protocols/oscar/oscar.c:3687
+#: ../libgaim/protocols/oscar/oscar.c:3695
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Work Address"
-
-#: ../src/protocols/oscar/oscar.c:6232
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Work Information"
 msgstr "Work Information"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Company"
-
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../libgaim/protocols/oscar/oscar.c:3701
 msgid "Division"
 msgstr "Division"
 
-#: ../src/protocols/oscar/oscar.c:6235
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Position"
 msgstr "Position"
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../libgaim/protocols/oscar/oscar.c:3704
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../libgaim/protocols/oscar/oscar.c:3762
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: ../src/protocols/oscar/oscar.c:6335
+#: ../libgaim/protocols/oscar/oscar.c:3802
 #, 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"
 
-#: ../src/protocols/oscar/oscar.c:6366
+#: ../libgaim/protocols/oscar/oscar.c:3807
+msgid "Screen name"
+msgstr "Screen name"
+
+#: ../libgaim/protocols/oscar/oscar.c:3833
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No results found for e-mail address %s"
 
-#: ../src/protocols/oscar/oscar.c:6387
+#: ../libgaim/protocols/oscar/oscar.c:3854
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "You should receive an e-mail asking to confirm %s."
 
-#: ../src/protocols/oscar/oscar.c:6389
+#: ../libgaim/protocols/oscar/oscar.c:3856
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: ../src/protocols/oscar/oscar.c:6420
+#: ../libgaim/protocols/oscar/oscar.c:3887
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: ../src/protocols/oscar/oscar.c:6423
+#: ../libgaim/protocols/oscar/oscar.c:3890
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9255,12 +10623,12 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../libgaim/protocols/oscar/oscar.c:3893
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../libgaim/protocols/oscar/oscar.c:3896
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9269,7 +10637,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../libgaim/protocols/oscar/oscar.c:3899
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9278,7 +10646,7 @@
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
-#: ../src/protocols/oscar/oscar.c:6435
+#: ../libgaim/protocols/oscar/oscar.c:3902
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9287,7 +10655,7 @@
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
-#: ../src/protocols/oscar/oscar.c:6438
+#: ../libgaim/protocols/oscar/oscar.c:3905
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9296,12 +10664,12 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
-#: ../src/protocols/oscar/oscar.c:6441
+#: ../libgaim/protocols/oscar/oscar.c:3908
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: ../src/protocols/oscar/oscar.c:6451
+#: ../libgaim/protocols/oscar/oscar.c:3918
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9310,26 +10678,27 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
+#: ../libgaim/protocols/oscar/oscar.c:3919
+#: ../libgaim/protocols/oscar/oscar.c:3926
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../src/protocols/oscar/oscar.c:6457
+#: ../libgaim/protocols/oscar/oscar.c:3924
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "The e-mail address for %s is %s"
 
-#: ../src/protocols/oscar/oscar.c:6535
+#: ../libgaim/protocols/oscar/oscar.c:4099
 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."
 
-#: ../src/protocols/oscar/oscar.c:6775
+#: ../libgaim/protocols/oscar/oscar.c:4351
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: ../src/protocols/oscar/oscar.c:6776
+#: ../libgaim/protocols/oscar/oscar.c:4352
 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 "
@@ -9339,7 +10708,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: ../src/protocols/oscar/oscar.c:6790
+#: ../libgaim/protocols/oscar/oscar.c:4366
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9354,11 +10723,11 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: ../src/protocols/oscar/oscar.c:6795
+#: ../libgaim/protocols/oscar/oscar.c:4371
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: ../src/protocols/oscar/oscar.c:6837
+#: ../libgaim/protocols/oscar/oscar.c:4415
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9373,11 +10742,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: ../src/protocols/oscar/oscar.c:6842
+#: ../libgaim/protocols/oscar/oscar.c:4420
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: ../src/protocols/oscar/oscar.c:6911
+#: ../libgaim/protocols/oscar/oscar.c:4489
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9388,16 +10757,17 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
+#: ../libgaim/protocols/oscar/oscar.c:4491
+#: ../libgaim/protocols/oscar/oscar.c:4904
+#: ../libgaim/protocols/oscar/oscar.c:4918
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: ../src/protocols/oscar/oscar.c:7020
+#: ../libgaim/protocols/oscar/oscar.c:4595
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../libgaim/protocols/oscar/oscar.c:4596
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9407,13 +10777,16 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
+#: ../libgaim/protocols/oscar/oscar.c:4799
+#: ../libgaim/protocols/oscar/oscar.c:4800
+#: ../libgaim/protocols/oscar/oscar.c:4805
+#: ../libgaim/protocols/oscar/oscar.c:4972
+#: ../libgaim/protocols/oscar/oscar.c:4973
+#: ../libgaim/protocols/oscar/oscar.c:4978
 msgid "Orphans"
 msgstr "Orphans"
 
-#: ../src/protocols/oscar/oscar.c:7318
+#: ../libgaim/protocols/oscar/oscar.c:4902
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9422,11 +10795,12 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "(no name)"
 msgstr "(no name)"
 
-#: ../src/protocols/oscar/oscar.c:7332
+#: ../libgaim/protocols/oscar/oscar.c:4916
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9437,7 +10811,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: ../src/protocols/oscar/oscar.c:7415
+#: ../libgaim/protocols/oscar/oscar.c:5009
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9446,11 +10820,11 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../libgaim/protocols/oscar/oscar.c:5015
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: ../src/protocols/oscar/oscar.c:7465
+#: ../libgaim/protocols/oscar/oscar.c:5059
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9460,17 +10834,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7510
+#: ../libgaim/protocols/oscar/oscar.c:5104
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:7511
+#: ../libgaim/protocols/oscar/oscar.c:5105
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../libgaim/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9481,88 +10855,110 @@
 "following reason:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7515
+#: ../libgaim/protocols/oscar/oscar.c:5109
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5145 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../src/protocols/oscar/oscar.c:7588
+#: ../libgaim/protocols/oscar/oscar.c:5185
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: ../src/protocols/oscar/oscar.c:7658
+#: ../libgaim/protocols/oscar/oscar.c:5255
 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."
 
-#: ../src/protocols/oscar/oscar.c:7813
+#: ../libgaim/protocols/oscar/oscar.c:5417
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(retrieving)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8119
+#: ../libgaim/protocols/oscar/oscar.c:5730
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: ../src/protocols/oscar/oscar.c:8120
+#: ../libgaim/protocols/oscar/oscar.c:5731
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: ../src/protocols/oscar/oscar.c:8139
+#: ../libgaim/protocols/oscar/oscar.c:5777
+#, 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."
+
+#: ../libgaim/protocols/oscar/oscar.c:5781
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/peer.c:990
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../libgaim/protocols/oscar/oscar.c:5819
+msgid "Get AIM Info"
+msgstr "Get AIM Info"
+
+#: ../libgaim/protocols/oscar/oscar.c:5825
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: ../src/protocols/oscar/oscar.c:8146
+#: ../libgaim/protocols/oscar/oscar.c:5833
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: ../src/protocols/oscar/oscar.c:8159
+#: ../libgaim/protocols/oscar/oscar.c:5846
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../src/protocols/oscar/oscar.c:8178
+#: ../libgaim/protocols/oscar/oscar.c:5868
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: ../src/protocols/oscar/oscar.c:8235
+#: ../libgaim/protocols/oscar/oscar.c:5927
 msgid "Require authorization"
 msgstr "Require authorisation"
 
-#: ../src/protocols/oscar/oscar.c:8238
+#: ../libgaim/protocols/oscar/oscar.c:5930
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (enabling this will cause you to receive spam!)"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../libgaim/protocols/oscar/oscar.c:5935
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privacy Options"
 
-#: ../src/protocols/oscar/oscar.c:8260
+#: ../libgaim/protocols/oscar/oscar.c:5952
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: ../src/protocols/oscar/oscar.c:8261
+#: ../libgaim/protocols/oscar/oscar.c:5953
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../libgaim/protocols/oscar/oscar.c:5960
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: ../src/protocols/oscar/oscar.c:8320
+#: ../libgaim/protocols/oscar/oscar.c:6016
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: ../src/protocols/oscar/oscar.c:8365
+#: ../libgaim/protocols/oscar/oscar.c:6061
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: ../src/protocols/oscar/oscar.c:8368
+#: ../libgaim/protocols/oscar/oscar.c:6064
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: ../src/protocols/oscar/oscar.c:8369
+#: ../libgaim/protocols/oscar/oscar.c:6065
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9570,64 +10966,706 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: ../src/protocols/oscar/oscar.c:8386
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Find Buddy by E-Mail"
 msgstr "Find Buddy by E-Mail"
 
-#: ../src/protocols/oscar/oscar.c:8387
+#: ../libgaim/protocols/oscar/oscar.c:6083
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../libgaim/protocols/oscar/oscar.c:6084
 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."
 
-#: ../src/protocols/oscar/oscar.c:8481
+#: ../libgaim/protocols/oscar/oscar.c:6253
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8492
+#: ../libgaim/protocols/oscar/oscar.c:6264
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8496
+#: ../libgaim/protocols/oscar/oscar.c:6268
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8506
+#: ../libgaim/protocols/oscar/oscar.c:6278
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8513
+#: ../libgaim/protocols/oscar/oscar.c:6285
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: ../src/protocols/oscar/oscar.c:8517
+#: ../libgaim/protocols/oscar/oscar.c:6289
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: ../src/protocols/oscar/oscar.c:8521
-msgid "Display Currently Registered Address"
-msgstr "Display Currently Registered Address"
-
-#: ../src/protocols/oscar/oscar.c:8525
-msgid "Change Currently Registered Address..."
-msgstr "Change Currently Registered Address"
-
-#: ../src/protocols/oscar/oscar.c:8532
+#: ../libgaim/protocols/oscar/oscar.c:6293
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Display Currently Registered E-mail Address"
+
+#: ../libgaim/protocols/oscar/oscar.c:6297
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Change Currently Registered E-mail Address"
+
+#: ../libgaim/protocols/oscar/oscar.c:6304
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by E-Mail..."
-msgstr "Search for Buddy by E-Mail..."
-
-#: ../src/protocols/oscar/oscar.c:8543
+#: ../libgaim/protocols/oscar/oscar.c:6310
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Search for Buddy by E-mail Address..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6315
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#: ../libgaim/protocols/oscar/oscar.c:6383
+msgid "Use recent buddies group"
+msgstr "Use recent buddies group"
+
+#: ../libgaim/protocols/oscar/oscar.c:6386
+msgid "Show how long you have been idle"
+msgstr "Show how long you have been idle"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/oscar.c:6512
+#: ../libgaim/protocols/oscar/oscar.c:6514
+msgid "AIM/ICQ Protocol Plugin"
+msgstr "AIM/ICQ Protocol Plug-in"
+
+#: ../libgaim/protocols/oscar/oscar.c:6539
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
+msgid "Encoding"
+msgstr "Encoding"
+
+#: ../libgaim/protocols/oscar/oscar.c:6543
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+
+#: ../libgaim/protocols/oscar/peer.c:623
+#, 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."
+
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Attempting to connect to %s:%hu."
+
+#: ../libgaim/protocols/oscar/peer.c:803
+msgid "Attempting to connect via proxy server."
+msgstr "Attempting to connect via proxy server."
+
+#: ../libgaim/protocols/oscar/peer.c:980
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s has just asked to directly connect to %s"
+
+#: ../libgaim/protocols/oscar/peer.c:984
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "Primary Information"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "Personal Introduction"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "QQ Number"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "Country/Region"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "County/Province/State"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "Horoscope Symbol"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "Zodiac Sign"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "Blood Group"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "College/University"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "Email"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "Postcode"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "Mobile Number"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "Telephone Number"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "Aquarius"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "Pisces"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "Aries"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "Taurus"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "Gemini"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "Cancer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "Leo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "Virgo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "Libra"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "Scorpio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "Sagittarius"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "Capricorn"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "Rat"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "Ox"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "Tiger"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "Rabbit"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "Dragon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "Snake"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "Horse"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "Goat"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr "Monkey"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "Rooster"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "Dog"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "Pig"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Other"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Modify my information"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Update my information"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "Your information has been updated"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "You rejected %d's request"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Enter your reason:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Reject request"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Sorry, you are not my type..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+msgid "Reject"
+msgstr "Reject"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr "Add buddy with auth request failed"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "You have successfully removed a buddy"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "You have successfully removed yourself from a buddy"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "User %d needs authentication"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Enter request here"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "Would you like to be my friend?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Send"
+msgstr "Send"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "You have added %d to your buddy list"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "QQid Error"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "Invalid QQid"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "Group ID"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "Creator"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "Group Description"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "Auth"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr "Please input external group ID"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr "You can only search for permanent QQ groups\n"
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "User %d applied to join group %d"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr "Reason: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+msgid "QQ Qun Operation"
+msgstr "QQ Qun Operation"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr "Approve"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr "Your request to join group %d has been rejected by admin %d"
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr "Your request to join group %d has been approved by admin %d"
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "You [%d] have left group \"%d\""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "You [%d] have been added to group \"%d\""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "This group has been added to your buddy list"
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "I am not a member"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "I am a member"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "I am applying to join"
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "I am the admin"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "Unknown status"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "This group does not allow others to join"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "You have successfully left the group"
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr "QQ Group Auth"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "Your authorisation request has been accepted by the QQ server"
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr "You inputted a group ID outside the permitted range"
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "Are you sure you want to leave this Qun?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Note: if you are the creator \n"
+"this operation will eventually remove this Qun."
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "Continue"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Code [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "Group Operation Error"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "Do you want to approve the request?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr "You have successfully modified the Qun member"
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr "You have successfully modified the Qun information"
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "You have successfully created a Qun"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "Would you like to set up the Qun details now?"
+msgstr "Would you like to set up the Qun details now?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+msgid "Setup"
+msgstr "Setup"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "System Message"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "Server ACK"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Send IM fail\n"
+msgstr "IM send failed\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr "Keep alive error; connection appears to be lost!"
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr "Request login token error!"
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Incorrect Password"
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr "Unable to login; check debug log"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Available"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Away"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Offline"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Invalid name"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Selection"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Select a number"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Faces"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "Change Your QQ Face"
+
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "Change Face"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Update"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Currently Online</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Last Refreshed</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Connection Mode</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Server IP</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>My Public IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:522
+msgid "<i>Information below may not be accurate</i><br>\n"
+msgstr "<i>Information below may not be accurate</i><br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Login Time</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Last Login IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Last Login Time</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "Login Information"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Modify My Information"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Change My Face"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Change Password"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Show Login Information"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "Exit this QQ Qun"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "This function has not been implemented yet"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Please wait for new version"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9638,157 +11676,249 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plug-in"
-
-#: ../src/protocols/oscar/oscar.c:8742
-msgid "Auth host"
-msgstr "Auth host"
-
-#: ../src/protocols/oscar/oscar.c:8745
-msgid "Auth port"
-msgstr "Auth port"
-
-#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
-msgid "Encoding"
-msgstr "Encoding"
-
-#: ../src/protocols/oscar/oscar.c:8752
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ Protocol\tPlugin"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "Login using TCP"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "Login Hidden"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "Socket send error"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Connection refused"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Socket error"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "Unable to read from socket"
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d has declined the file %s"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "File Send"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d cancelled the transfer of %s"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Connection lost!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Login failed; no reply!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "Connection timeout!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "User info is not updated"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Send packet"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Packets lost, send again?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "You have been added by %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "Would you like to add this person?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s has added you [%s]"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "User %s rejected your request"
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "User %s has approved your request"
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s wants to add you [%s] as a friend"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Message: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s is not in your buddy list"
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "Would you like to add this person?"
+
+#: ../libgaim/protocols/sametime/sametime.c:414
 msgid "Connection closed (writing)"
 msgstr "Connection closed (writing)"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../libgaim/protocols/sametime/sametime.c:1260
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Group Title:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes Group ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../libgaim/protocols/sametime/sametime.c:1263
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info for Group %s"
 
-#: ../src/protocols/sametime/sametime.c:1272
+#: ../libgaim/protocols/sametime/sametime.c:1265
 msgid "Notes Address Book Information"
 msgstr "Notes Address Book Information"
 
-#: ../src/protocols/sametime/sametime.c:1304
+#: ../libgaim/protocols/sametime/sametime.c:1297
 msgid "Invite Group to Conference..."
 msgstr "Invite Group to Conference..."
 
-#: ../src/protocols/sametime/sametime.c:1314
+#: ../libgaim/protocols/sametime/sametime.c:1307
 msgid "Get Notes Address Book Info"
 msgstr "Get Notes Address Book Info"
 
-#: ../src/protocols/sametime/sametime.c:1467
+#: ../libgaim/protocols/sametime/sametime.c:1460
 msgid "Sending Handshake"
 msgstr "Sending Handshake"
 
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../libgaim/protocols/sametime/sametime.c:1465
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Waiting for Handshake Acknowledgement"
 
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../libgaim/protocols/sametime/sametime.c:1470
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake Acknowledged, Sending Login"
 
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../libgaim/protocols/sametime/sametime.c:1475
 msgid "Waiting for Login Acknowledgement"
 msgstr "Waiting for Login Acknowledgement"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1480
 msgid "Login Redirected"
 msgstr "Login Redirected"
 
-#: ../src/protocols/sametime/sametime.c:1493
+#: ../libgaim/protocols/sametime/sametime.c:1486
 msgid "Forcing Login"
 msgstr "Forcing Login"
 
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../libgaim/protocols/sametime/sametime.c:1490
 msgid "Login Acknowledged"
 msgstr "Login Acknowledged"
 
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../libgaim/protocols/sametime/sametime.c:1495
 msgid "Starting Services"
 msgstr "Starting Services"
 
-#: ../src/protocols/sametime/sametime.c:1507
+#: ../libgaim/protocols/sametime/sametime.c:1500
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../libgaim/protocols/sametime/sametime.c:1598
 #, 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"
 
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../libgaim/protocols/sametime/sametime.c:1603
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime Administrator Announcement"
 
-#: ../src/protocols/sametime/sametime.c:1662
+#: ../libgaim/protocols/sametime/sametime.c:1655
 msgid "Connection reset"
 msgstr "Connection reset"
 
-#: ../src/protocols/sametime/sametime.c:1669
+#: ../libgaim/protocols/sametime/sametime.c:1662
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error reading from socket: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
+#: ../libgaim/protocols/sametime/sametime.c:1685
+#: ../libgaim/protocols/sametime/sametime.c:3681
 msgid "Unable to connect to host"
 msgstr "Unable to connect to host"
 
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../libgaim/protocols/sametime/sametime.c:1723
 #, c-format
 msgid "Announcement from %s"
 msgstr "Announcement from %s"
 
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../libgaim/protocols/sametime/sametime.c:1897
 msgid "Conference Closed"
 msgstr "Conference Closed"
 
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/sametime/sametime.c:2354
 msgid "Unable to send message: "
 msgstr "Unable to send message: "
 
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../libgaim/protocols/sametime/sametime.c:2911
 msgid "Place Closed"
 msgstr "Place Closed"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../libgaim/protocols/sametime/sametime.c:3202
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../libgaim/protocols/sametime/sametime.c:3203
 msgid "Speakers"
 msgstr "Speakers"
 
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../libgaim/protocols/sametime/sametime.c:3204
 msgid "Video Camera"
 msgstr "Video Camera"
 
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../libgaim/protocols/sametime/sametime.c:3208
 msgid "File Transfer"
 msgstr "File Transfer"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../libgaim/protocols/sametime/sametime.c:3242
 #, c-format
 msgid ""
 "\n"
@@ -9797,7 +11927,7 @@
 "\n"
 "<b>Supports:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3247
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9805,11 +11935,11 @@
 "\n"
 "<b>External User</b>"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../libgaim/protocols/sametime/sametime.c:3353
 msgid "Create conference with user"
 msgstr "Create conference with user"
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../libgaim/protocols/sametime/sametime.c:3354
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9818,27 +11948,27 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 
-#: ../src/protocols/sametime/sametime.c:3373
+#: ../libgaim/protocols/sametime/sametime.c:3358
 msgid "New Conference"
 msgstr "New Conference"
 
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../libgaim/protocols/sametime/sametime.c:3360
 msgid "Create"
 msgstr "Create"
 
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../libgaim/protocols/sametime/sametime.c:3424
 msgid "Available Conferences"
 msgstr "Available Conference"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3430
 msgid "Create New Conference..."
 msgstr "Create New Conference..."
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../libgaim/protocols/sametime/sametime.c:3437
 msgid "Invite user to a conference"
 msgstr "Invite user to a conference"
 
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../libgaim/protocols/sametime/sametime.c:3438
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9849,27 +11979,23 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 
-#: ../src/protocols/sametime/sametime.c:3458
+#: ../libgaim/protocols/sametime/sametime.c:3443
 msgid "Invite to Conference"
 msgstr "Invite to Conference"
 
-#: ../src/protocols/sametime/sametime.c:3460
-msgid "Invite"
-msgstr "Invite"
-
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../libgaim/protocols/sametime/sametime.c:3533
 msgid "Invite to Conference..."
 msgstr "Invite to Conference..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../libgaim/protocols/sametime/sametime.c:3538
 msgid "Send TEST Announcement"
 msgstr "Send TEST Announcement"
 
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../libgaim/protocols/sametime/sametime.c:3585
 msgid "No Sametime Community Server specified"
 msgstr "No Sametime Community Server specified"
 
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../libgaim/protocols/sametime/sametime.c:3607
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -9878,62 +12004,62 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../libgaim/protocols/sametime/sametime.c:3612
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile Connection Setup"
 
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../libgaim/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server Specified"
 msgstr "No Sametime Community Server Specified"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../libgaim/protocols/sametime/sametime.c:4075
 msgid "<b>External User</b><br>"
 msgstr "<b>External User:</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../libgaim/protocols/sametime/sametime.c:4078
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>User ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../libgaim/protocols/sametime/sametime.c:4084
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Full Name:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../libgaim/protocols/sametime/sametime.c:4090
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Last Known Client:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../libgaim/protocols/sametime/sametime.c:4098
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unknown (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../libgaim/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Supports:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4121
+#: ../libgaim/protocols/sametime/sametime.c:4111
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4254
+#: ../libgaim/protocols/sametime/sametime.c:5418
 msgid "User Name"
 msgstr "User Name"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../libgaim/protocols/sametime/sametime.c:4257
+#: ../libgaim/protocols/sametime/sametime.c:5421
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../libgaim/protocols/sametime/sametime.c:4281
 msgid "An ambiguous user ID was entered"
 msgstr "An ambiguous user ID was entered"
 
-#: ../src/protocols/sametime/sametime.c:4292
+#: ../libgaim/protocols/sametime/sametime.c:4282
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9942,15 +12068,15 @@
 "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."
 
-#: ../src/protocols/sametime/sametime.c:4297
+#: ../libgaim/protocols/sametime/sametime.c:4287
 msgid "Select User"
 msgstr "Select User"
 
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../libgaim/protocols/sametime/sametime.c:4357
 msgid "Unable to add user: user not found"
 msgstr "Unable to add user: user not found"
 
-#: ../src/protocols/sametime/sametime.c:4369
+#: ../libgaim/protocols/sametime/sametime.c:4359
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -9959,11 +12085,11 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 
-#: ../src/protocols/sametime/sametime.c:4374
+#: ../libgaim/protocols/sametime/sametime.c:4364
 msgid "Unable to add user"
 msgstr "Unable to add user"
 
-#: ../src/protocols/sametime/sametime.c:4946
+#: ../libgaim/protocols/sametime/sametime.c:4936
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9972,63 +12098,63 @@
 "Error reading file %s: \n"
 "%s\n"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../libgaim/protocols/sametime/sametime.c:5068
 msgid "Remotely Stored Buddy List"
 msgstr "Remotely Stored Buddy List"
 
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5073
 msgid "Buddy List Storage Mode"
 msgstr "Buddy List Storage Mode"
 
-#: ../src/protocols/sametime/sametime.c:5085
+#: ../libgaim/protocols/sametime/sametime.c:5076
 msgid "Local Buddy List Only"
 msgstr "Local Buddy List Only"
 
-#: ../src/protocols/sametime/sametime.c:5087
+#: ../libgaim/protocols/sametime/sametime.c:5078
 msgid "Merge List from Server"
 msgstr "Merge List from Server"
 
-#: ../src/protocols/sametime/sametime.c:5089
+#: ../libgaim/protocols/sametime/sametime.c:5080
 msgid "Merge and Save List to Server"
 msgstr "Merge and Save List to Server"
 
-#: ../src/protocols/sametime/sametime.c:5091
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Synchronize List with Server"
 msgstr "Synchronise List with Server"
 
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../libgaim/protocols/sametime/sametime.c:5131
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import Sametime List for Account %s"
 
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../libgaim/protocols/sametime/sametime.c:5170
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export Sametime List for Account %s"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../libgaim/protocols/sametime/sametime.c:5223
 msgid "Unable to add group: group exists"
 msgstr "Unable to add group: group exists"
 
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../libgaim/protocols/sametime/sametime.c:5224
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "A group named '%s' already exists in your buddy list."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../libgaim/protocols/sametime/sametime.c:5227
+#: ../libgaim/protocols/sametime/sametime.c:5356
 msgid "Unable to add group"
 msgstr "Unable to add group"
 
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../libgaim/protocols/sametime/sametime.c:5286
 msgid "Possible Matches"
 msgstr "Possible Matches"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5302
 msgid "Notes Address Book group results"
 msgstr "Notes Address Book group results"
 
-#: ../src/protocols/sametime/sametime.c:5312
+#: ../libgaim/protocols/sametime/sametime.c:5303
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10039,15 +12165,15 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 
-#: ../src/protocols/sametime/sametime.c:5317
+#: ../libgaim/protocols/sametime/sametime.c:5308
 msgid "Select Notes Address Book"
 msgstr "Select Notes Address Book"
 
-#: ../src/protocols/sametime/sametime.c:5359
+#: ../libgaim/protocols/sametime/sametime.c:5350
 msgid "Unable to add group: group not found"
 msgstr "Unable to add group: group not found"
 
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../libgaim/protocols/sametime/sametime.c:5352
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10056,11 +12182,11 @@
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../libgaim/protocols/sametime/sametime.c:5393
 msgid "Notes Address Book Group"
 msgstr "Notes Address Book Group"
 
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../libgaim/protocols/sametime/sametime.c:5394
 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."
@@ -10068,12 +12194,12 @@
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../libgaim/protocols/sametime/sametime.c:5442
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Search results for '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5452
+#: ../libgaim/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10084,25 +12210,25 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../libgaim/protocols/sametime/sametime.c:5475
 msgid "No matches"
 msgstr "No matches"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../libgaim/protocols/sametime/sametime.c:5476
 #, 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."
 
-#: ../src/protocols/sametime/sametime.c:5489
+#: ../libgaim/protocols/sametime/sametime.c:5480
 msgid "No Matches"
 msgstr "No Matches"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../libgaim/protocols/sametime/sametime.c:5517
 msgid "Search for a user"
 msgstr "Search for a user"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5518
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10110,83 +12236,83 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 
-#: ../src/protocols/sametime/sametime.c:5530
+#: ../libgaim/protocols/sametime/sametime.c:5521
 msgid "User Search"
 msgstr "User Search"
 
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../libgaim/protocols/sametime/sametime.c:5533
 msgid "Import Sametime List..."
 msgstr "Import Sametime List..."
 
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../libgaim/protocols/sametime/sametime.c:5537
 msgid "Export Sametime List..."
 msgstr "Export Sametime List..."
 
-#: ../src/protocols/sametime/sametime.c:5550
+#: ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Add Notes Address Book Group..."
 msgstr "Add Notes Address Book Group..."
 
-#: ../src/protocols/sametime/sametime.c:5554
+#: ../libgaim/protocols/sametime/sametime.c:5545
 msgid "User Search..."
 msgstr "User Search..."
 
-#: ../src/protocols/sametime/sametime.c:5651
+#: ../libgaim/protocols/sametime/sametime.c:5642
 msgid "Force login (ignore server redirects)"
 msgstr "Force login (ignore server redirects)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../libgaim/protocols/sametime/sametime.c:5652
 msgid "Hide client identity"
 msgstr "Hide client identity"
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s is not present in the network"
 
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Cannot perform the key agreement"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Error occurred during key agreement"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Key Agreement failed"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Timeout during key agreement"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Key agreement was aborted"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Key agreement is already started"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Key agreement cannot be started with yourself"
 
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "The remote user is not present in the network any more"
 
-#: ../src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -10195,7 +12321,7 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10206,59 +12332,60 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Key Agreement Request"
 
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "IM With Password"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Cannot set IM key"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Set IM Password"
 
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "User Information"
 
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "The %s buddy is not trusted"
 
-#: ../src/protocols/silc/buddy.c:737
+#: ../libgaim/protocols/silc/buddy.c:737
 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."
@@ -10267,16 +12394,16 @@
 "You can use the Get Public Key command to get the public key."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "The %s buddy is not present in the network"
 
-#: ../src/protocols/silc/buddy.c:1076
+#: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10284,15 +12411,15 @@
 "To add the buddy you must import their public key. Press Import to import a "
 "public key."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Select correct user"
 
-#: ../src/protocols/silc/buddy.c:1177
+#: ../libgaim/protocols/silc/buddy.c:1177
 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."
@@ -10300,7 +12427,7 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 
-#: ../src/protocols/silc/buddy.c:1179
+#: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10308,213 +12435,213 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Detached"
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Happy"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Sad"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Angry"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "In Love"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Bored"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Excited"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "User Modes"
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Mood"
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Device"
 
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
 msgid "Kill User"
 msgstr "Kill User"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Draw On Whiteboard"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:235
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: ../src/protocols/silc/chat.c:406
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../libgaim/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10528,325 +12655,318 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Group name"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:948
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "User Limit"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:723
 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."
 
-#: ../src/protocols/silc/chat.c:877
-msgid "Get Info"
-msgstr "Get Info"
-
-#: ../src/protocols/silc/chat.c:885
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Invite List"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: ../src/protocols/silc/chat.c:916
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: ../src/protocols/silc/chat.c:924
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: ../src/protocols/silc/chat.c:935
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: ../src/protocols/silc/chat.c:942
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: ../src/protocols/silc/chat.c:947
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: ../src/protocols/silc/chat.c:954
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: ../src/protocols/silc/chat.c:959
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../libgaim/protocols/silc/chat.c:1097
 #, 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"
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "Call Command"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Secure File Transfer"
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Error during file transfer"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Key agreement failed"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "File transfer session does not exist"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "No file transfer session active"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "File transfer already started"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Could not perform key agreement for file transfer"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Could not start the file transfer"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/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"
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/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"
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/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"
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/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"
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/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"
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/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)"
 
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Date of Birth"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Job Title"
-
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Job Role"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Unit"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-Mail"
-
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
+msgid "Real Name"
+msgstr "Real Name"
+
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Status Text"
 
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_More..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
+#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Room List"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -10881,102 +13001,102 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1610
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1721
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:199
+#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-#: ../src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -10985,12 +13105,12 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
 #, 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?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11003,61 +13123,65 @@
 "%s\n"
 "%s\n"
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verify Public Key"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_View..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: ../src/protocols/silc/silc.c:158
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: ../src/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
-#: ../src/protocols/silc/silc.c:202
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: ../src/protocols/silc/silc.c:287
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/protocols/silc/silc.c:328
+#: ../libgaim/protocols/silc/silc.c:323
 msgid "Cannot initialize SILC protocol"
 msgstr "Cannot initialise SILC protocol"
 
-#: ../src/protocols/silc/silc.c:335
+#: ../libgaim/protocols/silc/silc.c:330
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Cannot find/access ~/.silc directory"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: ../src/protocols/silc/silc.c:349
+#: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Could not load SILC key pair: %s"
 
-#: ../src/protocols/silc/silc.c:369
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "Unable to create connection"
 
-#: ../src/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: ../src/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:680
+msgid "In love"
+msgstr "In love"
+
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11065,43 +13189,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
+#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: ../src/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:703
+msgid "Video conferencing"
+msgstr "Video conferencing"
+
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: ../src/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Online Services"
 
-#: ../src/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: ../src/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: ../src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Your vCard File"
 
-#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
+#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: ../src/protocols/silc/silc.c:749
+#: ../libgaim/protocols/silc/silc.c:745
 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 "
@@ -11111,168 +13235,165 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: ../src/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
+#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
-#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
+#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "Create New SILC Key Pair"
 
-#: ../src/protocols/silc/silc.c:841
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "Passphrases do not match"
 
-#: ../src/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "Key Pair Generation failed"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "Key length"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "Public key file"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "Private key file"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Real Name"
-
-#: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Re-type Passphrase"
-
-#: ../src/protocols/silc/silc.c:958
+#: ../libgaim/protocols/silc/silc.c:947
+msgid "Passphrase (retype)"
+msgstr "Passphrase (retype)"
+
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "Generate Key Pair"
 
-#: ../src/protocols/silc/silc.c:1002
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "Online Status"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: ../src/protocols/silc/silc.c:1015
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "Create SILC key pair..."
 
-#: ../src/protocols/silc/silc.c:1114
+#: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: ../src/protocols/silc/silc.c:1306
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: ../src/protocols/silc/silc.c:1387
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: ../src/protocols/silc/silc.c:1489
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: ../src/protocols/silc/silc.c:1494
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: ../src/protocols/silc/silc.c:1496
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Unknown command: %s, (may be a Gaim bug)"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: ../src/protocols/silc/silc.c:1610
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../libgaim/protocols/silc/silc.c:1610
 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"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: ../src/protocols/silc/silc.c:1623
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2602
+#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 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"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../libgaim/protocols/silc/silc.c:1626
 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"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: ../src/protocols/silc/silc.c:1647
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11280,7 +13401,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11288,15 +13409,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11304,35 +13425,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../libgaim/protocols/silc/silc.c:1680
 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"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../libgaim/protocols/silc/silc.c:1692
 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"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: ../src/protocols/silc/silc.c:1705
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: ../src/protocols/silc/silc.c:1714
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11349,111 +13470,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../libgaim/protocols/silc/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plug-in"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1825
+#: ../libgaim/protocols/silc/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../libgaim/protocols/silc/silc.c:1858
 msgid "Public Key file"
 msgstr "Public Key file"
 
-#: ../src/protocols/silc/silc.c:1866
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Private Key file"
 msgstr "Private Key file"
 
-#: ../src/protocols/silc/silc.c:1876
+#: ../libgaim/protocols/silc/silc.c:1872
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1886
+#: ../libgaim/protocols/silc/silc.c:1882
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1889
+#: ../libgaim/protocols/silc/silc.c:1885
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: ../src/protocols/silc/silc.c:1892
+#: ../libgaim/protocols/silc/silc.c:1888
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: ../src/protocols/silc/silc.c:1895
+#: ../libgaim/protocols/silc/silc.c:1891
 msgid "Block invites"
 msgstr "Block invites"
 
-#: ../src/protocols/silc/silc.c:1898
+#: ../libgaim/protocols/silc/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: ../src/protocols/silc/silc.c:1901
+#: ../libgaim/protocols/silc/silc.c:1897
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
-#: ../src/protocols/silc/silc.c:1904
+#: ../libgaim/protocols/silc/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Block messages to whiteboard"
 
-#: ../src/protocols/silc/silc.c:1907
+#: ../libgaim/protocols/silc/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Automatically open whiteboard"
 
-#: ../src/protocols/silc/silc.c:1910
+#: ../libgaim/protocols/silc/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Digitally sign and verify all messages"
 
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #. 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)
-#: ../src/protocols/silc/util.c:314
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Real Name: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
-
-#: ../src/protocols/silc/util.c:320
+#: ../libgaim/protocols/silc/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "E-mail: \t\t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Host Name: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Country: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithm: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
-msgstr "Key length: \t%d bits\n"
-
-#: ../src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Key Length: \t%d bits\n"
+
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11464,7 +13585,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11473,32 +13594,36 @@
 "Public Key Babbleprint:\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Public Key Information"
 
-#: ../src/protocols/silc/util.c:516
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Paging"
 
-#: ../src/protocols/silc/util.c:540
+#: ../libgaim/protocols/silc/util.c:563
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Computer"
 
-#: ../src/protocols/silc/util.c:544
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:546
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/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?"
 
-#: ../src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -11507,33 +13632,40 @@
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Could not write"
 
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: ../src/protocols/simple/simple.c:994
+#: ../libgaim/protocols/simple/simple.c:1035
 msgid "Wrong Password"
 msgstr "Incorrect Password"
 
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
+#: ../libgaim/protocols/simple/simple.c:1516
+#: ../libgaim/protocols/simple/simple.c:1558
+#: ../libgaim/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr "Could not create listen socket"
 
-#: ../src/protocols/simple/simple.c:1474
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "Couldn't resolve host"
 
-#: ../src/protocols/simple/simple.c:1572
+#: ../libgaim/protocols/simple/simple.c:1630
+msgid "Could not resolve hostname"
+msgstr "Could not resolve hostname"
+
+#: ../libgaim/protocols/simple/simple.c:1647
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP usernames may not contain whitespaces or @ symbols"
 
@@ -11545,153 +13677,157 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1734
+#: ../libgaim/protocols/simple/simple.c:1815
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protocol Plug-in"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1735
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE Protocol Plug-in"
 
-#: ../src/protocols/simple/simple.c:1757
+#: ../libgaim/protocols/simple/simple.c:1838
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publish status (note: anyone can watch you)"
 
-#: ../src/protocols/simple/simple.c:1763
+#: ../libgaim/protocols/simple/simple.c:1844
 msgid "Use UDP"
 msgstr "Use UDP"
 
-#: ../src/protocols/simple/simple.c:1765
+#: ../libgaim/protocols/simple/simple.c:1846
 msgid "Use proxy"
 msgstr "Use proxy"
 
-#: ../src/protocols/simple/simple.c:1767
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1769
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Auth User"
 msgstr "Auth User"
 
-#: ../src/protocols/simple/simple.c:1771
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:503
 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."
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/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."
 
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/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."
 
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/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."
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Failure."
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "E-mail lookup restricted."
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "No keywords."
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Incorrect nickname or password."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Your warning level is currently too high to log in."
 
-#: ../src/protocols/toc/toc.c:552
+#: ../libgaim/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -11699,41 +13835,41 @@
 "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."
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/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"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: ../src/protocols/toc/toc.c:786
+#: ../libgaim/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."
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: ../src/protocols/toc/toc.c:994
+#: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -11743,52 +13879,48 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "_Group:"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Set User Info"
-
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Change Password"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, 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"
 
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -11803,27 +13935,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plug-in"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "TOC host"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "TOC port"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
@@ -11831,21 +13956,21 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../libgaim/protocols/yahoo/yahoo.c:994
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "The user %s wants to add %s to his or her buddy list%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Message (optional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, 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."
 
-#: ../src/protocols/yahoo/yahoo.c:957
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11854,11 +13979,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11869,11 +13994,11 @@
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: ../src/protocols/yahoo/yahoo.c:1772
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11882,19 +14007,19 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11906,134 +14031,140 @@
 "attempt to log in using Web Messenger authentication, will which result in "
 "reduced functionality and features."
 
-#: ../src/protocols/yahoo/yahoo.c:1829
-msgid "Incorrect password."
-msgstr "Incorrect password."
-
-#: ../src/protocols/yahoo/yahoo.c:1832
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked, please log in to the Yahoo! website."
 
-#: ../src/protocols/yahoo/yahoo.c:1835
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, 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."
 
-#: ../src/protocols/yahoo/yahoo.c:1889
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, 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."
 
-#: ../src/protocols/yahoo/yahoo.c:1892
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Unable to read"
-
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr "Received unexpected HTTP response from server."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Not at Home"
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Not at Desk"
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Not in Office"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Appear Online"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
-#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Presence"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../src/protocols/yahoo/yahoo.c:2988
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Presence Settings"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3621
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 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"
 
-#: ../src/protocols/yahoo/yahoo.c:3626
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  List rooms on the Yahoo network"
 
-#: ../src/protocols/yahoo/yahoo.c:3630
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz a user to get their attention"
 
-#: ../src/protocols/yahoo/yahoo.c:3634
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -12047,77 +14178,162 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plug-in"
 
-#: ../src/protocols/yahoo/yahoo.c:3746
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3749
-msgid "Pager host"
-msgstr "Pager host"
-
-#: ../src/protocols/yahoo/yahoo.c:3752
-msgid "Japan Pager host"
-msgstr "Japan Pager host"
-
-#: ../src/protocols/yahoo/yahoo.c:3755
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
+msgid "Pager server"
+msgstr "Pager server"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
+msgid "Japan Pager server"
+msgstr "Japan Pager server"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Pager port"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
-msgid "File transfer host"
-msgstr "File transfer host"
-
-#: ../src/protocols/yahoo/yahoo.c:3761
-msgid "Japan file transfer host"
-msgstr "Japan file transfer host"
-
-#: ../src/protocols/yahoo/yahoo.c:3764
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
+msgid "File transfer server"
+msgstr "File transfer server"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
+msgid "Japan file transfer server"
+msgstr "Japan file transfer server"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Chat room locale"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "Chat room list URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
-msgid "YCHT host"
-msgstr "YCHT host"
-
-#: ../src/protocols/yahoo/yahoo.c:3780
-msgid "YCHT port"
-msgstr "YCHT port"
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat server"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chat port"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Invitation Rejected"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Failed to join chat"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Unknown room"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Perhaps the room is full"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Not available"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Failed to join buddy in chat"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Perhaps they're not in a chat?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Voices"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "User Rooms"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+msgid "Sent Doodle request."
+msgstr "Sent Doodle request."
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr "Unable to establish file descriptor."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
 msgid "Write Error"
 msgstr "Write Error"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:707
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:828
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -12125,7 +14341,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:830
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -12133,47 +14349,47 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Latest News"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
 msgid "Last Update"
 msgstr "Last Update"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12181,7 +14397,7 @@
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12189,7 +14405,7 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
 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 "
@@ -12199,86 +14415,24 @@
 "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."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Failed to join chat"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Unknown room"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Perhaps the room is full"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Not available"
-
-#: ../src/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "You are now chatting in %s."
-
-#: ../src/protocols/yahoo/yahoochat.c:626
-msgid "Failed to join buddy in chat"
-msgstr "Failed to join buddy in chat"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Maybe they're not in a chat?"
-msgstr "Perhaps they're not in a chat?"
-
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Fetching the room list failed."
-msgstr "Fetching the room list failed."
-
-#: ../src/protocols/yahoo/yahoochat.c:1433
-msgid "Voices"
-msgstr "Voices"
-
-#: ../src/protocols/yahoo/yahoochat.c:1436
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
-msgid "Unable to fetch room list."
-msgstr "Unable to fetch room list."
-
-#: ../src/protocols/yahoo/yahoochat.c:1510
-msgid "User Rooms"
-msgstr "User Rooms"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Lost connection with server\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12286,77 +14440,81 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Unable to send to chat %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Class:"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Attempt to subscribe to %s,%s,%s failed"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 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"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 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"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 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"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 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"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 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;"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12364,7 +14522,7 @@
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2650
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
 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;"
@@ -12372,7 +14530,7 @@
 "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;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12380,15 +14538,15 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 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;"
 
-#: ../src/protocols/zephyr/zephyr.c:2767
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -12402,72 +14560,102 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plug-in"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
+msgid "Use tzc"
+msgstr "Use tzc"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
+msgid "tzc command"
+msgstr "tzc command"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Import from .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Import from .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Realm"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Proxy connection error %d"
-
-#. Forbidden
-#: ../src/proxy.c:1327
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Access denied: proxy server forbids port %d tunnelling."
-
-#: ../src/proxy.c:2327
-msgid "Invalid proxy settings"
-msgstr "Invalid proxy settings"
-
-#: ../src/proxy.c:2327
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-
-#: ../src/savedstatuses.c:514
+#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+"Unable to create socket:\n"
+"%s"
+
+#: ../libgaim/proxy.c:644
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Unable to parse response from HTTP proxy: %s\n"
+
+#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP proxy connection error %d"
+
+#: ../libgaim/proxy.c:764
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
+
+#: ../libgaim/proxy.c:984
+#, c-format
+msgid "Error resolving %s"
+msgstr "Error resolving %s"
+
+#: ../libgaim/proxy.c:1676
+msgid "Could not resolve host name"
+msgstr "Could not resolve host name"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../libgaim/request.h:1354
+msgid "_Accept"
+msgstr "_Accept"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libgaim/savedstatuses.c:46
+msgid "I'm not here right now"
+msgstr "I'm not here right now"
+
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "saved statuses"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr "I'm not here right now"
-
-#: ../src/server.c:227
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: ../src/server.c:681
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12476,78 +14664,73 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 
-#: ../src/server.c:686
+#: ../libgaim/server.c:691
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: ../src/server.c:690
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Unset"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s signed on"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s came back"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s signed off"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s went away."
-
-#: ../src/status.c:1317
+#: ../libgaim/status.c:611
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s changed status from %s to %s"
+
+#: ../libgaim/status.c:621
+#, c-format
+msgid "%s is now %s"
+msgstr "%s is now %s"
+
+#: ../libgaim/status.c:626
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s is no longer %s"
+
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: ../src/status.c:1330
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: ../src/status.c:1392
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s became idle"
 
-#: ../src/status.c:1394
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is no longer idle"
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2457
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error reading %s"
 
-#: ../src/util.c:2458
+#: ../libgaim/util.c:2430
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12556,56 +14739,81 @@
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 
-#: ../src/util.c:2897
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: ../src/util.c:2900
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Unknown."
 
-#: ../src/util.c:2926
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../src/util.c:2938
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../src/util.c:2946
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hour"
 msgstr[1] "%s, %d hours"
 
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../src/util.c:2960
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/util.c:3441
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Error opening connection.\n"
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Unable to connect to %s"
+
+#: ../libgaim/util.c:3287
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+
+#: ../libgaim/util.c:3324
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Error reading from %s: %s"
+
+#: ../libgaim/util.c:3355
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Error writing to %s: %s"
+
+#: ../libgaim/util.c:3380
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Unable to connect to %s: %s"