changeset 14947: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 c1daa05f2a64
children 97169e766d9c
files gtk/gtkdialogs.c po/en_GB.po po/gl.po po/sl.po
diffstat 4 files changed, 22131 insertions(+), 16148 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkdialogs.c	Fri Nov 10 05:18:10 2006 +0000
+++ b/gtk/gtkdialogs.c	Fri Nov 10 06:23:10 2006 +0000
@@ -167,7 +167,7 @@
 	{N_("Serbian"),             "sr", "Danilo Šegan", "dsegan@gmx.net"},
 	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "urke@users.sourceforge.net"},
 	{N_("Slovak"),              "sk", "Richard Golier", "golierr@gmail.com"},
-	{N_("Slovenian"),           "sl", "Matjaz Horvat", "matjaz@owca.info"},
+	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "filmsi@users.sourceforge.net"},
 	{N_("Albanian"),            "sq", "Besnik Bleta", "besnik@programeshqip.org"},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", "tlt@mima.x.se"},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
@@ -212,6 +212,7 @@
 	{N_("Russian"),             "ru", "Alexandre Prokoudine", NULL},
 	{N_("Russian"),             "ru", "Sergey Volozhanin", NULL},
 	{N_("Slovak"),              "sk", "Daniel Režný", NULL},
+	{N_("Slovenian"),           "sl", "Matjaz Horvat", NULL},
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
--- 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"
--- a/po/gl.po	Fri Nov 10 05:18:10 2006 +0000
+++ b/po/gl.po	Fri Nov 10 06:23:10 2006 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-30 22:29+0200\n"
-"PO-Revision-Date: 2006-05-30 22:34+0200\n"
+"POT-Creation-Date: 2006-11-05 00:10+0100\n"
+"PO-Revision-Date: 2006-11-05 15:47+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.2\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
@@ -29,787 +29,1052 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Envía mensaxes instantáneas a través de múltiples protocolos"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Proba de Cipher"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Proba os cifrados que se inclúen en gaim."
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "O amigo está inactivo"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "O amigo está ausente"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "O amigo está en ausencia \"extendida\""
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "O amigo está móbil"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "O amigo está desconectado"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Valores a usar cando..."
-
-#: ../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 ""
-"O amigo con <i>puntuación alta</i> é o amigo que terá prioridade no "
-"contacto.\n"
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Usar o último amigo cando as puntuacións sexan iguais"
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Valores a usar para a conta..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Prioridade do contacto"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
-
-#. *< 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 ""
-"Permite cambiar os puntos asignados aos estados inactivo/ausente/"
-"desconectado para os amigos en cálculos de prioridades de contacto."
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Chat tolo"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Complemento para establecer unha sesión de Crazychat."
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
-"Usar Gaim para obter enderezos IP dos amigos para conectar unha sesión de "
-"Crazychat"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Configuración de rede"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "Porto TCP"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "Porto UDP"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Axuste da función"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Desactivado"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:152
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
-msgid "DBus Plugin Example"
-msgstr "Exemplo de complemento DBus"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Premer co botón dereito para máis mensaxes sen ler...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d mensaxe sen ler de %s\n"
-msgstr[1] "%d mensaxes sen ler de %s\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Cambiar estado"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
-#: ../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:2843 ../src/protocols/yahoo/yahoo.c:2731
-#: ../src/status.c:155
-msgid "Available"
-msgstr "Dispoñible"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
-#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
-#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4401
-#: ../src/protocols/oscar/oscar.c:5444 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Ausente"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
-#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5416
-#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
-msgid "Offline"
-msgstr "Desconectado"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Novo..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Gardado..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Amosar lista de amigos"
-
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
-msgid "Unread Messages"
-msgstr "Mensaxes sen ler"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Nova mensaxe..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
+#: ../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 "Erro"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "A conta non foi engadida"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "O alcume dunha conta non debe estar baleiro."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "Notificacións de correo novo"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Recordar contrasinal"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+msgid "Modify Account"
+msgstr "Modificar conta"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Conta nova"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Nome de usuario:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+msgid "Alias:"
+msgstr "Alcume:"
+
+#. 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:1388
+#: ../libgaim/protocols/oscar/oscar.c:2152
+#: ../libgaim/protocols/oscar/oscar.c:2191
+#: ../libgaim/protocols/oscar/oscar.c:2239
+#: ../libgaim/protocols/oscar/oscar.c:5733
+#: ../libgaim/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5962
+#: ../libgaim/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/oscar/oscar.c:6087
+#: ../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 "Cancelar"
+
+#. 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 "Gardar"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Está seguro de que quere borrar %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Borrar conta"
+
+#: ../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 "Borrar"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1841
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Sen son"
-
-#. 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 "Saír"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Palpabrexa a icona na bandexa do sistema para as mensaxes sen ler..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "Mensaxes _instantáneas:"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
-msgid "Never"
-msgstr "Nunca"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "En conversacións agochadas"
-
-#: ../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:463 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Sempre"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "Mensaxes de c_hat:"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Cando se nomea o meu alcume"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Icona do área de notificación do sistema"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Mostra a icona para Gaim no área de notificación do sistema."
-
-#. *  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 ""
-"Mostra unha icona na área de notificación do sistema (por exemplo en Gnome, "
-"KDE ou Windows) para mostrar o estado actual de Gaim, permite un acceso "
-"rápido ás funcións máis comúns, e indicar se se debe mostrar a lista de "
-"amigos.Tamén ofrece opcións para facer palpabrexar as mensaxes sen ler."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Orientación"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "A orientación da bandexa."
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Por número de conversacións"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Localización da conversación"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Número de conversacións por fiestra"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separar fiestras de MIs e chats cando se ubican por número"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "_UbicaciónExt"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Opcións adicionais de ubicación de conversacións."
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Restrinxir o número de conversación por fiestra, de forma optativa utilizar "
-"fiestras distintas para MIs e chats"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Control de ficheiros de Gaim"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Permite controlar Gaim introducindo comandos nun ficheiro."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Complemento de demostración de Gaim"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Un exemplo de complemento que fai cousas - consulte a descrición."
-
-#. *  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 ""
-"Este é un complemento moi interesante que foi moitas cousas:\n"
-"- Dille quén escribiu o programa cando inicia a sesión\n"
-"- Transpón o texto que lle envían\n"
-"- Envía unha mensaxe ás persoas na súa lista inmediatamente cando se conectan"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Cor do cursor"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Cor secundario do cursor"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Cor de ligazón"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Tamaño do expansor GtkTreeView"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "Separación horizontal de GtkTreeView"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Entrada de conversacións"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Historial de conversacións"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Visor de rexistro"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Diálogo de solicitude"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Diálogo de notificación"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Sangría do expansor GtkTreeView"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Seleccionar a cor para %s"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Seleccionar cor"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Seleccionar fonte para %s"
-
-#: ../plugins/gaimrc.c:364
-msgid "Select Interface Font"
-msgstr "Seleccionar fonte de instancia"
-
-#: ../plugins/gaimrc.c:420
-msgid "General"
-msgstr "Xeral"
-
-#: ../plugins/gaimrc.c:425
-msgid "GTK+ Interface Font"
-msgstr "Fonte da interface GTK+"
-
-#: ../plugins/gaimrc.c:445
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Tema de atallo de texto GTK+"
-
-#: ../plugins/gaimrc.c:480
-msgid "Interface colors"
-msgstr "Cores da interface"
-
-#: ../plugins/gaimrc.c:504
-msgid "Widget Sizes"
-msgstr "Tamaños do widget"
-
-#: ../plugins/gaimrc.c:525
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../plugins/gaimrc.c:548
-msgid "Tools"
-msgstr "Ferramentas"
-
-#: ../plugins/gaimrc.c:553
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Escribir axustes en %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:561
-msgid "Re-read gtkrc files"
-msgstr "Reler ficheiros gtkrc"
-
-#: ../plugins/gaimrc.c:588
-msgid "Gaim GTK+ Theme Control"
-msgstr "Control de tema GTK+ de gaim"
-
-#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provee acceso as opcións de gtkrc usadas comunmente."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Configuración dos xestos co rato"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Botón central do rato"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Botón dereito do rato"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "Mostrar xestos _visuais"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Xestos co rato"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Proporciona soporte para xestos co rato"
-
-#. *  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 ""
-"Permite soporte de xesto do rato nas fiestras de conversación.\n"
-"Arrastre co botón central do rato para realizar as seguintes accións:\n"
-"\n"
-"Abaixo e despois á dereita para pechar unha fiestra de conversación.\n"
-"Arriba e despois á esquerda para cambiar á conversación anterior.\n"
-"Arriba e despois á dereita para cambiar á seguinte conversación."
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "Pode activar/desactivar contas da seguinte lista."
+
+#: ../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:2430
+#: ../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 "Engadir"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Modificar"
+
+#: ../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 fixo a %s seu amigo/a%s%s"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+msgid "Add buddy to your list?"
+msgstr "Engadir o amigo a súa lista?"
+
+#: ../console/gntblist.c:269
+msgid "You must provide a screename for the buddy."
+msgstr "Debe dar un nome de usuario para o amigo."
+
+#: ../console/gntblist.c:271
+msgid "You must provide a group."
+msgstr "Debe indicar un grupo."
+
+#: ../console/gntblist.c:273
+msgid "You must select an account."
+msgstr "Debe especificar unha conta."
+
+#: ../console/gntblist.c:277
+msgid "Error adding buddy"
+msgstr "Erro engadindo o amigo"
+
+#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2804
+msgid "Screen Name"
+msgstr "Nome de usuario"
+
+#: ../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 "Alcume"
+
+#: ../console/gntblist.c:308 ../console/gntblist.c:380
+msgid "Group"
+msgstr "Grupo"
+
+#: ../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 "Conta"
+
+#: ../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 "Engadir amigo"
+
+#: ../console/gntblist.c:317
+msgid "Please enter buddy information."
+msgstr "Introduza a información do amigo."
+
+#: ../console/gntblist.c:340 ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "Chats"
 
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../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:754
-#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
-#: ../src/protocols/msn/msn.c:1601
+#: ../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 "Nome"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Mensaxería instantánea"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4530
-#: ../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:2974
-msgid "Add Buddy"
-msgstr "Engadir amigo"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:455
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Seleccione unha persoa da súa axenda mostrada abaixo, ou engada unha nova "
-"persoa."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:468
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6024
-#: ../src/protocols/sametime/sametime.c:5524
-msgid "Search"
-msgstr "Buscar"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4614
-#: ../src/gtkblist.c:4978
-msgid "Group:"
-msgstr "Grupo:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:575
-#: ../plugins/gevolution/assoc-buddy.c:464
-#: ../plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Nova persoa"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:592
-msgid "Select Buddy"
-msgstr "Seleccionar amigo"
-
-#. 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 ""
-"Seleccione unha persoa da súa axenda á que engadir este amigo, cree unha "
-"nova persoa."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "_Detalles de usuario"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Asociar amigo"
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1120
-msgid "None"
-msgstr "Ningún"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4423 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Amigos"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Imposible enviar correo-e"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "O executable de evolution non se atopou na RUTA."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "O amigo especificado non se atopou nos contactos de Evolution."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Engadir á axenda"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Enviar correo electrónico"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Configuración da integración con Evolution"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma automática"
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
-#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
-msgid "Account"
-msgstr "Conta"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Integración con Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Ofrece integración con Evolution."
-
-#: ../plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Introduza a información da persoa a continuación."
-
-#: ../plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta máis abaixo."
-
-#: ../plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Tipo de conta:"
-
-#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4576
-msgid "Screen name:"
-msgstr "Nome de usuario:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Información opcional:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
-msgid "Buddy Icon"
-msgstr "Icona de amigo"
-
-#: ../plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Nome:"
-
-#: ../plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Apelidos:"
-
-#: ../plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "Proba de sinais GTK"
-
-#. *< 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 ""
-"Probar para ver se todos os sinais da interface de usuario funcionan "
-"correctamente."
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274
+msgid "Add Chat"
+msgstr "Engadir Chat"
+
+#: ../console/gntblist.c:384
+msgid "You can edit more information from the context menu later."
+msgstr "Pode editar máis información máis adiante através do menú contextual."
+
+#: ../console/gntblist.c:395 ../console/gntblist.c:408
+msgid "Error adding group"
+msgstr "Erro engadindo o grupo"
+
+#: ../console/gntblist.c:396
+msgid "You must give a name for the group to add."
+msgstr "Debe dar un nome para o grupo a engadir."
+
+#: ../console/gntblist.c:409
+msgid "A group with the name already exists."
+msgstr "Xa existe un grupo con ese nome."
+
+#: ../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 "Engadir grupo"
+
+#: ../console/gntblist.c:416
+msgid "Enter the name of the group"
+msgstr "Introduza o nome do grupo"
+
+#: ../console/gntblist.c:746
+msgid "Edit Chat"
+msgstr "Editar Chat"
+
+#: ../console/gntblist.c:746
+msgid "Please Update the necessary fields."
+msgstr "Actualice os campos necesarios."
+
+#: ../console/gntblist.c:747 ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "Editar"
+
+#: ../console/gntblist.c:761
+msgid "Auto-join"
+msgstr "Conectarse automaticamente"
+
+#: ../console/gntblist.c:770
+msgid "Edit Settings"
+msgstr "Editar configuración"
+
+#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Obter información"
+
+#: ../console/gntblist.c:821
+msgid "Add Buddy Pounce"
+msgstr "Engadir aviso de amigo"
+
+#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Enviar ficheiro"
+
+#: ../console/gntblist.c:832
+msgid "View Log"
+msgstr "Ver rexistro"
+
+#: ../console/gntblist.c:912
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Por favor, introduza o seu novo nome para %s"
+
+#: ../console/gntblist.c:914 ../console/gntblist.c:915
+#: ../console/gntblist.c:1084
+msgid "Rename"
+msgstr "Renomear"
+
+#: ../console/gntblist.c:914
+msgid "Enter empty string to reset the name."
+msgstr "Introduza unha cadea en branco para reiniciar o nome."
+
+#: ../console/gntblist.c:987
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Se elimina este contacto tamén eliminará tódolos amigos no contacto"
+
+#: ../console/gntblist.c:995
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Se elimina este grupo tamén eliminará a tódolos amigos no grupo"
+
+#: ../console/gntblist.c:1000
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Está seguro de que quere borrar %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:1003
+msgid "Confirm Remove"
+msgstr "Confirmar borrado"
+
+#: ../console/gntblist.c:1006 ../console/gntblist.c:1086
+#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Eliminar"
+
+#. 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 "Lista de amigos"
+
+#: ../console/gntblist.c:1090
+#, fuzzy
+msgid "Place tagged"
+msgstr "Lugares nos que viviu"
+
+#: ../console/gntblist.c:1093
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: ../console/gntblist.c:1120 ../console/gntblist.c:1221
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Conta: %s (%s)"
+
+#: ../console/gntblist.c:1145
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Inactivo: %s"
+
+#: ../console/gntblist.c:1200
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Alcume: %s\n"
+
+#: ../console/gntblist.c:1212
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"En liña: %d\n"
+"Total: %d"
+
+#: ../console/gntblist.c:1233
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Visto por última vez: fai %s"
+
+#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478
+#: ../gtk/gtkstatusbox.c:984
+msgid "New..."
+msgstr "Novo..."
+
+#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479
+#: ../gtk/gtkstatusbox.c:985
+msgid "Saved..."
+msgstr "Gardado..."
+
+#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799
+#: ../gtk/gtkdialogs.c:879
+msgid "_Name"
+msgstr "_Nome"
+
+#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804
+#: ../gtk/gtkdialogs.c:884
+msgid "_Account"
+msgstr "_Conta"
+
+#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675
+msgid "New Instant Message"
+msgstr "Mensaxe instantánea nova"
+
+#: ../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 "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
+
+#. *
+#. * 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:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../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 "Aceptar"
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Opcións"
+
+#: ../console/gntblist.c:1944
+msgid "Send IM..."
+msgstr "Enviar MI..."
+
+#: ../console/gntblist.c:1948
+#, fuzzy
+msgid "Toggle offline buddies"
+msgstr "/Amigos/Amosar amigos desconectados"
+
+#: ../console/gntblist.c:1952
+msgid "Sort by status"
+msgstr "Arranxar por estado"
+
+#: ../console/gntblist.c:1956
+msgid "Sort alphabetically"
+msgstr "Arranxar alfabeticamente"
+
+#: ../console/gntblist.c:1960
+msgid "Sort by log size"
+msgstr "Arranxar polo tamaño de rexistro"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s desconectado."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s foi desconectado debido ao seguinte erro:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "Erro de conexión"
+
+#: ../console/gntconv.c:71
+msgid "No such command."
+msgstr "Non existe o comando."
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Erro de sintase: Escribiu suficientes argumentos para ese comando."
+
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+msgid "Your command failed for an unknown reason."
+msgstr "Seu comando fallou por motivos descoñecidos."
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+msgid "That command only works in chats, not IMs."
+msgstr "Ese comando só funciona en chats, non en MIs."
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+msgid "That command only works in IMs, not chats."
+msgstr "Ese comando só funciona en MIs, non en chats."
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+msgid "That command doesn't work on this protocol."
+msgstr "Ese comando só funciona neste protocolo."
+
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Ordes non soportadas. NON se enviou a mensaxe."
+
+#: ../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 "<RESPOSTA AUTOMÁTICA>"
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:443
+msgid "List of users:\n"
+msgstr "Lista de usuarios:\n"
+
+#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+msgid "Supported debug options are:  version"
+msgstr "As opcións de depuración soportadas son:  version"
+
+#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+msgid "No such command (in this context)."
+msgstr "Non existe o comando (neste contexto)."
+
+#: ../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 ""
+"Usar \"/help &lt;comando&gt;\" para obter axuda dun comando específico.\n"
+"Os seguintes comandos está dispoñibles neste contexto:\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;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
+"un comando."
+
+#: ../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;acción&gt;:  Enviar unha acción estilo IRC a un amigo ou a un 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;opción&gt;:  Enviar información de depuración sobre a conversación "
+"actual."
+
+#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741
+msgid "clear: Clears the conversation scrollback."
+msgstr "limpar: Limpa a conversación desprazada."
+
+#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;comando&gt;:  Recibir axuda dun comando específico."
+
+#: ../console/gntconv.c:661
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Amosar a fiestra de complementos."
+
+#: ../console/gntconv.c:664
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Amosar lista de amigos."
+
+#: ../console/gntconv.c:667
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Amosar fiestra de contas."
+
+#: ../console/gntconv.c:670
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Amosar a fiestra de depuración."
+
+#: ../console/gntconv.c:673
+msgid "prefs: Show the preference window."
+msgstr "prefs: Amosar a fiestra de preferencias."
+
+#: ../console/gntconv.c:676
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Amosar a fiestra de estados gardados."
+
+#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Fiestra de depuración"
+
+#. 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 "Limpar"
+
+#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Pausar"
+
+#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Marcas de tempo"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Tente `%s -h' para máis información.\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"
+"Uso: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    usa DIR para ficheiros de configuración\n"
+"  -d, --debug         imprimir mensaxes de depuración a stdout\n"
+"  -h, --help          amosar esta axuda e saír\n"
+"  -n, --nologin       non conectarse automaticamente\n"
+"  -v, --version       amosar a versión actual e saír\n"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Emails"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "Ten un correo!"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1138
+msgid "From"
+msgstr "De"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../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 "Pechar"
+
+#: ../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) ten %d mensaxe nova."
+msgstr[1] "%s (%s) ten %d mensaxes novas."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Correo novo"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2611
+#, c-format
+msgid "Info for %s"
+msgstr "Información sobre %s"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Información de amigos"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Continuar"
+
+#: ../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 "MI"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Unirse"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(ningún)"
+
+#: ../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 ""
+"Nome: %s\n"
+"Versión: %s\n"
+"Descrición: %s\n"
+"Autor: %s\n"
+"Sitio web: %s\n"
+"Nome de ficheiro: %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Debe cargar o complemento antes de poder configuralo."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "Aínda hai que facer algo sobre isto."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "Non hai opcións de configuración para este complemento."
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr "Pode activar/desactivar complementos da seguinte lista."
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Configurar complemento"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Amosar tempos de ausencia"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Amosar amigos desconectados"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Amosar marcas de tempo"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Notificar aos amigos cando lles está escribindo"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Formato de rexistro"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Rexistro de MIs"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Rexistrar chats"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Rexistrar os eventos de cambios de estado"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1913
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "Conversacións"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1924
+msgid "Logging"
+msgstr "Rexistro"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
+#: ../gtk/gtkprefs.c:1949
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Funcionalidade non implementada todavía."
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Está seguro de que quere borrar \"%s\"?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "Borrar estado"
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Estados gardados"
+
+#: ../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 "Título"
+
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Tipo"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
+#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../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:5396
+#: ../libgaim/protocols/oscar/oscar.c:5411
+#: ../libgaim/protocols/oscar/oscar.c:5416
+#: ../libgaim/protocols/oscar/oscar.c:5624
+#: ../libgaim/protocols/oscar/oscar.c:5636
+#: ../libgaim/protocols/oscar/oscar.c:5649
+#: ../libgaim/protocols/oscar/oscar.c:5656
+#: ../libgaim/protocols/oscar/oscar.c:5663
+#: ../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 "Mensaxe"
+
+#. Use
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+msgid "Use"
+msgstr "Usar"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "Título inválido"
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "Introduza o título non baleiro para o estado."
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "Título duplicado"
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "Introduza un título distinto para o estado."
+
+#: ../console/gntstatus.c:439
+msgid "Substatus"
+msgstr "Subestado"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+msgid "Account:"
+msgstr "Conta:"
+
+#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../console/gntstatus.c:465
+msgid "Message:"
+msgstr "Mensaxe:"
+
+#: ../console/gntstatus.c:514
+msgid "Edit Status"
+msgstr "Editar estado"
+
+#: ../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 "Estado"
+
+#: ../console/gntstatus.c:556
+msgid "Use different status for following accounts"
+msgstr "Usar un estado diferente para as seguintes contas"
+
+#. Save & Use
+#: ../console/gntstatus.c:590
+msgid "Save & Use"
+msgstr "Gardar e usar"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Estados"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s acábase de conectar"
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s acábase de desconectar."
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s envioulle unha mensaxe."
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s dixo o seu alcume en %s"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s envioulle unha mensaxe en %s"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Conectouse/Desconectouse un amigo"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "Recibiu unha MI"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Alguén fala no chat"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Alguén menciona o seu nome no chat"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Notificar cun 'toaster' cando"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "Bip tamén!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "Establecer a fiestra de terminal coma URXENTE."
+
+#: ../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 "Complemento 'toaster' para Gaim-Text."
+
+#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversación con %s en %s:</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "O complemento de historial require conectarse"
 
-#: ../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"
@@ -821,15 +1086,15 @@
 "A activación do rexistro nas mensaxes instantáneas e/ou chats activará o "
 "historial para os mesmos tipos de conversación."
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "Historial"
-
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "HistorialGnt"
+
+#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra as conversacións rexistradas previamente nas novas conversacións."
 
-#: ../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."
@@ -837,1430 +1102,116 @@
 "Cando se abre unha nova conversación este complemento introduce a última "
 "conversación na conversación actual."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Iconizar en ausencia"
-
-#. *< 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 "Iconiza a lista de amigos e de conversacións cando vostede está ausente."
-
-#: ../plugins/idle.c:155 ../plugins/idle.c:213
-msgid "Minutes"
-msgstr "Minutos"
-
-#. 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.
-#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
-#: ../plugins/idle.c:312
-msgid "I'dle Mak'er"
-msgstr "Xenerador de ausencia"
-
-#: ../plugins/idle.c:163 ../plugins/idle.c:252
-msgid "Set Account Idle Time"
-msgstr "Establecer tempo de inactividade da conta"
-
-#: ../plugins/idle.c:166 ../plugins/idle.c:224
-msgid "_Set"
-msgstr "_Establecer"
-
-#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../plugins/idle.c:180
-msgid "None of your accounts are idle."
-msgstr "Ningunha das túas contas están inactivas."
-
-#: ../plugins/idle.c:196 ../plugins/idle.c:256
-msgid "Unset Account Idle Time"
-msgstr "Desestablecer tempo de inactividade da conta"
-
-#: ../plugins/idle.c:199
-msgid "_Unset"
-msgstr "_Desestablecer"
-
-#: ../plugins/idle.c:221 ../plugins/idle.c:260
-msgid "Set Idle Time for All Accounts"
-msgstr "Establecer o tempo de inactividade para todas as contas"
-
-#: ../plugins/idle.c:265
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Desactivar o tempo de inactividade para todas as contas inactivas"
-
-#: ../plugins/idle.c:314 ../plugins/idle.c:315
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Permite alterar canto tempo estivo ausente"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "Cliente de proba IPC"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Complemento de proba con soporte IPC, como un cliente."
-
-#. *  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 ""
-"Complemento de proba con soporte IPC, como un cliente. Este localiza o "
-"complemento de servidor e chama aos comandos rexistrados."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "Servidor de proba IPC"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Complemento de soporte IPC de proba, como un servidor."
-
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Complemento de soporte IPC de proba, como un servidor. Este rexistra os "
-"comandos IPC."
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "O usuario está desconectado."
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "Enviar resposta automática:"
-
-#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s desconectouse."
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr "Unha ou máis mensaxes pode que non chegaran ao destino."
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "Foi desconectado do servidor."
-
-#: ../plugins/log_reader.c:1456
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"Está actualmente desconectado. As mensaxes non se recibirán a non ser que se "
-"conecte."
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude máxima."
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "A mensaxe non puido ser enviada."
-
-#. 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.
-#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
-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.
-#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
-msgid "Fire"
-msgstr "Fogo"
-
-#. 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.
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
-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.
-#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
-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.
-#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1925
-msgid "General Log Reading Configuration"
-msgstr "Configuración de lectura de rexistro xeral"
-
-#: ../plugins/log_reader.c:1929
-msgid "Fast size calculations"
-msgstr "Cálculos de tamaño rápido"
-
-#: ../plugins/log_reader.c:1933
-msgid "Use name heuristics"
-msgstr "Usar nomes heurísticos"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1939
-msgid "Log Directory"
-msgstr "Directorio de rexistro"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1982
-msgid "Log Reader"
-msgstr "Lector de rexistro"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1986
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
-
-#. * description
-#: ../plugins/log_reader.c:1990
-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 ""
-"Cando os rexistros sexan vistos, este complemento incluirá rexistros doutros "
-"clientes de MI. Actualmente, isto inclúe a Adim, Fire, Messenger Plus!, MSN "
-"Messenger, e Trillian."
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Comprobador de correo"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Comproba se hai correo local novo."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Engade unha pequena caixa á lista de amigos que mostra se ten novo correo."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Cargador de complementos mono"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Carga complementos .NET con Mono."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Solicitouse unha sesión de mensaxería musical. Seleccione a icona de MM para "
-"aceptala."
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Confirmouse a sesión de mensaxería musical."
-
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Mensaxería musical"
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "Produciuse un conflicto ao executar a orde:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Erro executando o Editor"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "Ocorreu o seguinte erro:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "Configuración de mensaxes de música"
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Ruta do editor de partituras"
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Complemento de mensaxería musical para composición colaborativa."
-
-#. *  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 ""
-"O complemento de mensaxería musical permite traballar a distintos usuarios "
-"de forma simultánea nunha peza de música editando unha partitura común en "
-"tempo real."
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Notificar de"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "Fiestras de M_I"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "Fiestras de C_hat"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Só se alguén nomea o seu alcume"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "Fiestras en_focadas"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Métodos de notificación"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Prefixar a _cadea no título da fiestra:"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Inserir o _número de mensaxes novos no título da fiestra"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Establecer pista \"_URXENTE\" do xestor de fiestras"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "S_ubir a fiestra de conversación"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Eliminación da notificación"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Eliminar cando a fiestra da conversación obtén o _foco"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Eliminar cando a fiestra da conversación _recibe unha pulsación"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Eliminar cando se _escriba na fiestra da conversación"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Eliminar cando se envíe unha _mensaxe"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Eliminar ao cambiar de _solapa de conversación"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Notificación de mensaxes"
-
-#. *< 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 "Permite notificar de diversas formas a presencia de mensaxes sen ler."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Cargador de complementos Perl"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Provee soporte para cargar complementos en perl."
-
-#: ../plugins/psychic.c:19
-msgid "Psychic Mode"
-msgstr "Modo psíquico"
-
-#: ../plugins/psychic.c:20
-msgid "Psychic mode for incoming conversation"
-msgstr "Modo psíquico para conversación entrantes"
-
-#: ../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 ""
-"Fai que aparezan as fiestras de conversación cando un usuario empeza a "
-"enviarlle unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e 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."
-#: ../plugins/psychic.c:63
-msgid "You feel a disturbance in the force..."
-msgstr "Sentiches unha perturbación na forza..."
-
-#: ../plugins/psychic.c:82
-msgid "Only enable for users on the buddy list"
-msgstr "Activar só para usuarios da lista de amigos"
-
-#: ../plugins/psychic.c:87
-msgid "Disable when away"
-msgstr "Desactivar cando está ausente"
-
-#: ../plugins/psychic.c:91
-msgid "Display notification message in conversations"
-msgstr "Amosa a mensaxe de notificación nas conversación"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "En bruto"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Permítelle enviar datos en bruto a protocolos basados en texto."
-
-#: ../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 ""
-"Permítelle enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
-"IRC, TOC). Prema 'Intro' na caixa de entrada para envialo. Observe a fiestra "
-"de depuración."
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Está usando a versión de Gaim %s.  A versión actual é %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Rexistro de cambios:</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 ""
-"Pode obter a versión %s de:<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 "Nova versión dispoñible"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Notificación de versións"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Comproba periodicamente a existencia de novas versións."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Comproba periodicamente se hai novas versións dispoñibles e notifica ao "
-"usuario mostrándolle o rexistro de cambios."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Proba de sinais"
-
-#. *< 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 "Probar para ver se todas as sinais funcionan correctamente."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:37
-msgid "Simple Plugin"
-msgstr "Complemento sinxelo"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:40 ../plugins/simple.c:42
-msgid "Tests to see that most things are working."
-msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
-
-#: ../plugins/spellchk.c:1918
-msgid "Duplicate Correction"
-msgstr "Corrección duplicada"
-
-#: ../plugins/spellchk.c:1919
-msgid "The specified word already exists in the correction list."
-msgstr "A palabra especificada xa existe na lista de corrección."
-
-#: ../plugins/spellchk.c:2128
-msgid "Text Replacements"
-msgstr "Remprazos de texto"
-
-#: ../plugins/spellchk.c:2151
-msgid "You type"
-msgstr "Vostede escribe"
-
-#: ../plugins/spellchk.c:2165
-msgid "You send"
-msgstr "Vostede envía"
-
-#: ../plugins/spellchk.c:2179
-msgid "Whole words only"
-msgstr "Soamente palabras enteiras"
-
-#: ../plugins/spellchk.c:2191
-msgid "Case sensitive"
-msgstr "Sensible ás maiúsculas"
-
-#: ../plugins/spellchk.c:2217
-msgid "Add a new text replacement"
-msgstr "Engadir unha nova regra de remprazo de texto"
-
-#: ../plugins/spellchk.c:2233
-msgid "You _type:"
-msgstr "Vostede _escribe:"
-
-#: ../plugins/spellchk.c:2250
-msgid "You _send:"
-msgstr "Vostede _envía:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2262
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Axustar ao formato _exacto (desmarcar para xestionar maiúsculas e minúsculas "
-"automaticamente)"
-
-#: ../plugins/spellchk.c:2264
-msgid "Only replace _whole words"
-msgstr "Reemprazar soamente palabras _enteiras"
-
-#: ../plugins/spellchk.c:2289
-msgid "General Text Replacement Options"
-msgstr "Opcións de reemprazos de texto xeral"
-
-#: ../plugins/spellchk.c:2290
-msgid "Enable replacement of last word on send"
-msgstr "Activar a sustitución da última palabra ao enviar"
-
-#: ../plugins/spellchk.c:2315
-msgid "Text replacement"
-msgstr "Remprazo de texto"
-
-#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Rempraza o texto das mensaxes saíntes según as regras definidas polo usuario."
-
-#. *< 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 "Proporciona soporte SSL a través de 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 "Proporciona soporte SSL a través do NSS de Mozilla."
-
-#. *< 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 "Proporciona un recubrimento a través das bibliotecas de soporte de SSL."
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s xa non está ausente."
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s marchouse."
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s está agora inactivo."
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s xa non está inactivo."
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s conectouse."
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "Notificar cando"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "O amigo _auséntase"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "O amigo está _inactivo"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "_Conéctase/Desconectouse un amigo"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "Notificación de estado de amigos"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Notifica nunha fiestra de conversación cando un amigo auséntase ou volve ou "
-"está inactivo."
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Cargador de complementos Tcl"
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "Provee soporte para cargar complementos Tcl"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Deslizante de amigos"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Unha versión horizontal deslizante da lista de amigos."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "Selo temporal ao estilo iChat"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Retardo"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutos."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "Marca temporal"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Engade unha marca de tempo ao estilo iChat nas conversacións cada N minutos."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Opcións de formato da marca temporal"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Forzar formato de tempo de 24 horas (Gaim tradicional)"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Amosar datas en..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Co_nversacións:"
-
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Para mensaxes diferidas"
-
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Para mensaxes diferidas e para chats"
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Rexistro de _mensaxes:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "Formatos de marca de tempo de mensaxes"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "Personaliza o formato da marca de tempo de mensaxes."
-
-#. *  description
-#: ../plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Este complemento permite ao usuario personalizar os formatos de marca de "
-"tempo para as mensaxes de conversacións e mensaxes de rexistro."
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Opacidade:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Fiestras de conversación de MI"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Transparencia das fiestras de M_I"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "A_mosar barra deslizante na fiestra MI"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Eliminar a transparencia das fiestra MI ao enfocar"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Sempre enriba"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Fiestra da lista de amigos"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Transparencia da fiestra de lista de _amigos"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Eliminar transparencia da fiestra da lista de amigos ao obter o foco"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Transparencia"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Transparencia variable para a lista de amigos e as conversacións."
-
-#. *  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 ""
-"Este complemento activa transparencias alfa nas fiestras de conversación e "
-"na lista de amigos.\n"
-"\n"
-"* Nota: Este complemento require Win2000 ou outro máis novo."
-
-#: ../plugins/win32/winprefs/winprefs.c:434
-msgid "GTK+ Runtime Version"
-msgstr "Versión en execución de GTK+"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:442
-msgid "Startup"
-msgstr "Inicio"
-
-#: ../plugins/win32/winprefs/winprefs.c:443
-msgid "_Start Gaim on Windows startup"
-msgstr "_Iniciar Gaim ao iniciar Windows"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3667
-msgid "Buddy List"
-msgstr "Lista de amigos"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "_Dockable Buddy List"
-msgstr "Lista de amigos a_pilable"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:460
-msgid "_Keep Buddy List window on top:"
-msgstr "_Manter a fiestra de amigos por enriba:"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:465
-msgid "Only when docked"
-msgstr "Só cando está empotrado"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1879
-msgid "Conversations"
-msgstr "Conversacións"
-
-#: ../plugins/win32/winprefs/winprefs.c:470
-msgid "_Flash window when messages are received"
-msgstr "_Destello de fiestra cando se reciben mensaxes"
-
-#: ../plugins/win32/winprefs/winprefs.c:494
-msgid "WinGaim Options"
-msgstr "Opcións WinGaim"
-
-#: ../plugins/win32/winprefs/winprefs.c:496
-msgid "Options specific to Windows Gaim."
-msgstr "Opcións específicas de Gaim para Windows."
-
-#: ../plugins/win32/winprefs/winprefs.c:497
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-"Contén as opcións específicas para o Gaim de Windows, como o apilado da "
-"lista de amigos ou o palpabrexo de conversacións."
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "contas"
-
-#: ../src/account.c:918
-msgid "Password is required to sign on."
-msgstr "O contrasinal é necesario para iniciar sesión."
-
-#: ../src/account.c:943
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Introduza o contrasinal para %s (%s)"
-
-#: ../src/account.c:950
-msgid "Enter Password"
-msgstr "Introducir contrasinal"
-
-#: ../src/account.c:955
-msgid "Save password"
-msgstr "Gardar contrasinal"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3551
-#: ../src/gtkdialogs.c:607 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:808
-#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1317 ../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:1408 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5694
-#: ../src/protocols/oscar/oscar.c:5874 ../src/protocols/oscar/oscar.c:5899
-#: ../src/protocols/oscar/oscar.c:5955 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
-#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
-#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
-#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5019
-#: ../src/gtkdialogs.c:608 ../src/gtkdialogs.c:745 ../src/gtkdialogs.c:809
-#: ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:850 ../src/gtkdialogs.c:870
-#: ../src/gtkdialogs.c:914 ../src/gtkdialogs.c:969 ../src/gtkdialogs.c:1006
-#: ../src/gtkdialogs.c:1031 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
-#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1318
-#: ../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:1409 ../src/protocols/oscar/oscar.c:2168
-#: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5695 ../src/protocols/oscar/oscar.c:5747
-#: ../src/protocols/oscar/oscar.c:5875 ../src/protocols/oscar/oscar.c:5900
-#: ../src/protocols/oscar/oscar.c:5956 ../src/protocols/oscar/oscar.c:6025
-#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
-#: ../src/protocols/sametime/sametime.c:3453
-#: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5312
-#: ../src/protocols/sametime/sametime.c:5401
-#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
-#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../src/account.c:989 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Falta o complemento de protocolo para %s"
-
-#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3549
-msgid "Connection Error"
-msgstr "Erro de conexión"
-
-#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1270
-msgid "New passwords do not match."
-msgstr "Os novos contrasinais non coinciden."
-
-#: ../src/account.c:1080
-msgid "Fill out all fields completely."
-msgstr "Encha todos os campos completamente."
-
-#: ../src/account.c:1103
-msgid "Original password"
-msgstr "Contrasinal orixinal"
-
-#: ../src/account.c:1110
-msgid "New password"
-msgstr "Novo contrasinal"
-
-#: ../src/account.c:1117
-msgid "New password (again)"
-msgstr "Novo contrasinal (outra vez)"
-
-#: ../src/account.c:1123
-#, c-format
-msgid "Change password for %s"
-msgstr "Cambiar o contrasinal de %s"
-
-#: ../src/account.c:1131
-msgid "Please enter your current password and your new password."
-msgstr "Introduza seu contrasinal actual e o contrasinal novo."
-
-#: ../src/account.c:1164
-#, c-format
-msgid "Change user information for %s"
-msgstr "Cambiar a información do usuario %s"
-
-#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Establecer súa información de usuario"
-
-#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:593
-msgid "Save"
-msgstr "Gardar"
-
-#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
-#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "lista de amigos"
-
-#: ../src/blist.c:1179
-msgid "Chats"
-msgstr "Chats"
-
-#: ../src/blist.c:1901
-#, 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 amigo do grupo %s non se eliminou porque a súa conta non estaba "
-"conectada. Este amigo e os seus grupos non foron eliminados.\n"
-msgstr[1] ""
-"%d amigos do grupo %s non se eliminou porque a súa conta non estaba "
-"conectada. Este amigo e os seus grupos non foron eliminados.\n"
-
-#: ../src/blist.c:1911
-msgid "Group not removed"
-msgstr "Grupo non eliminado"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Erro de rexistro"
-
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s conectouse"
-
-#: ../src/connection.c:313
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s desconectouse"
-
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "Non se puido enviar a mensaxe. É demasiado longa."
-
-#: ../src/conversation.c:166 ../src/conversation.c:179
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Non se puido enviar a mensaxe a %s."
-
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "A mensaxe é demasiado longa."
-
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "Non se puido enviar a mensaxe."
-
-#: ../src/conversation.c:1517
-#, c-format
-msgid "%s entered the room."
-msgstr "%s entrou na sala."
-
-#: ../src/conversation.c:1520
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] entrou na sala."
-
-#: ../src/conversation.c:1627
-#, c-format
-msgid "You are now known as %s"
-msgstr "Agora se chama %s"
-
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s agora se chama %s"
-
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s saíu da sala."
-
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s saíu da sala (%s)."
-
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr "Sen nome"
-
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Erro lendo %s:\n"
-"%s.\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Erro escribindo %s:\n"
-"%s.\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Erro accedendo a %s:\n"
-"%s.\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Non se pode enviar un ficheiro de 0 bytes."
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Non se pode enviar un directorio."
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s non é un ficheiro regular. Non se sobrescribirá.\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s quere enviarlle %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s quere enviarlle un ficheiro"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Aceptar solicitude de transferencia de ficheiro de %s?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Hai un ficheiro dispoñible a descargar desde:\n"
-"Servidor remoto: %s\n"
-"Porto remoto: %d"
-
-#: ../src/ft.c:391
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "Ofrécese a enviar %s a %s"
-
-#: ../src/ft.c:443
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s non é un nome de ficheiro válido.\n"
-
-#: ../src/ft.c:464
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Ofrécese a enviar %s a %s"
-
-#: ../src/ft.c:476
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Iniciando transferencia de %s desde %s"
-
-#: ../src/ft.c:630
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Completouse a transferencia de %s"
-
-#: ../src/ft.c:633
-msgid "File transfer complete"
-msgstr "Transferencia de ficheiros completa"
-
-#: ../src/ft.c:1030
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Cancelou a transferencia de %s"
-
-#: ../src/ft.c:1035
-msgid "File transfer cancelled"
-msgstr "Transferencia de ficheiros cancelada"
-
-#: ../src/ft.c:1093
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s cancelou a transferencia de %s"
-
-#: ../src/ft.c:1098
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s cancelou a transferencia de ficheiros"
-
-#: ../src/ft.c:1155
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "Transferencia de ficheiro a %s fallou."
-
-#: ../src/ft.c:1157
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "Transferencia de ficheiro desde %s fallou."
-
-#: ../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>Ficheiro:</b> %s\n"
-"<b>Tamaño do ficheiro:</b> %s\n"
-"<b>Tamaño da imaxe:</b> %dx%d"
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+#: ../console/plugins/lastlog.c:121
+#, fuzzy
+msgid "GntLastlog"
+msgstr "Historial"
+
+#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr "Complemento 'Lastlog' para gaim-text."
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientación"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "A orientación da bandexa."
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Alcume"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Unirse"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Pechar _solapas"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "_MI"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "_Obter información"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Invitar"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Modificar"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "A_brir correo"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Pausar"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Opcións de conexión"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
-msgid "Protocol:"
-msgstr "Protocolo:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4597 ../src/gtkblist.c:4963
-msgid "Alias:"
-msgstr "Alcume:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "Recordar contrasinal"
+#: ../gtk/gtkaccount.c:483
+msgid "Local alias:"
+msgstr "Alcume local:"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "Opcións de usuario"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "Notificacións de correo novo"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "Icona de amigo:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr "Usar esta icona de amigo para esta conta:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "Opcións de %s"
 
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global do proxy"
 
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "Sen 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:1058
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
 msgid "Use Environmental Settings"
 msgstr "Usar configuración do entorno"
 
@@ -2269,310 +1220,265 @@
 #. 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.
-#: ../src/gtkaccount.c:1302
+#: ../gtk/gtkaccount.c:936
 msgid "If you look real closely"
 msgstr "Se miras de cerca"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1305
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr "podes ver as volvoretas apareándose"
 
-#: ../src/gtkaccount.c:1326
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../src/gtkaccount.c:1361
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../src/gtkaccount.c:1747
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3552
-msgid "Modify Account"
-msgstr "Modificar conta"
-
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../src/gtkaccount.c:1782
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. Register button
-#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:822
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Está seguro de que quere borrar %s?"
-
-#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Borrar"
-
-#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
-#: ../src/protocols/oscar/oscar.c:2823
-msgid "Screen Name"
-msgstr "Nome de usuario"
-
-#: ../src/gtkaccount.c:2270
+#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/gtkaccount.c:2597
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s fixo a %s seu amigo/a%s%s"
-
-#: ../src/gtkaccount.c:2646
-msgid "Add buddy to your list?"
-msgstr "Engadir o amigo a súa lista?"
-
-#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5018 ../src/gtkconv.c:1625
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Engadir"
-
-#: ../src/gtkblist.c:673
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/gtkblist.c:694
+#: ../gtk/gtkblist.c:726
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduza a información apropiada do chat ao que desexaría unirse.\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../src/gtkblist.c:949
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "Obter _información:"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "_MI"
-
-#: ../src/gtkblist.c:958
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../src/gtkblist.c:965
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "Engadir _aviso de amigo"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../src/gtkblist.c:984
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkblist.c:1043
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "Engadir un a_migo"
 
-#: ../src/gtkblist.c:1045
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "Engadir un C_hat"
 
-#: ../src/gtkblist.c:1048
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "_Borrar grupo"
 
-#: ../src/gtkblist.c:1050
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
 msgstr "_Renomear"
 
-#. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Unirse"
-
-#: ../src/gtkblist.c:1070
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1136
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3812
-#: ../src/gtkblist.c:3822
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
+#: ../gtk/gtkblist.c:4125
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
+#: ../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 "Non está conectado con ningunha conta que poida engadir a ese amigo."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2500
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2501
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/_Mensaxe instantánea nova..."
 
-#: ../src/gtkblist.c:2430
+#: ../gtk/gtkblist.c:2502
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _Chat..."
 
-#: ../src/gtkblist.c:2431
+#: ../gtk/gtkblist.c:2503
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obter _información do usuario..."
 
-#: ../src/gtkblist.c:2432
+#: ../gtk/gtkblist.c:2504
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _rexistro do usuario..."
 
-#: ../src/gtkblist.c:2434
+#: ../gtk/gtkblist.c:2506
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Amosar amigos _desconectados"
 
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2507
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Amosar grupos _baleiros"
 
-#: ../src/gtkblist.c:2436
+#: ../gtk/gtkblist.c:2508
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Amosar _detalles de amigos"
 
-#: ../src/gtkblist.c:2437
+#: ../gtk/gtkblist.c:2509
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Amosar _tempo de ausencia"
 
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2510
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/A_rranxar amigos"
 
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2512
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Engadir un amigo..."
 
-#: ../src/gtkblist.c:2441
+#: ../gtk/gtkblist.c:2513
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Engadir un _Chat..."
 
-#: ../src/gtkblist.c:2442
+#: ../gtk/gtkblist.c:2514
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Engadir un _grupo..."
 
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2516
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Saír"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2447
+#: ../gtk/gtkblist.c:2519
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5595
+#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2523
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2524
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de amigo"
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2525
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../src/gtkblist.c:2454
+#: ../gtk/gtkblist.c:2526
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2455
+#: ../gtk/gtkblist.c:2527
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2529
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2530
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../src/gtkblist.c:2459
+#: ../gtk/gtkblist.c:2531
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../src/gtkblist.c:2461
+#: ../gtk/gtkblist.c:2533
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2536
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../src/gtkblist.c:2465
+#: ../gtk/gtkblist.c:2537
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2538
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Fiestra de _depuración"
 
-#: ../src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2539
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
+#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
 #, c-format
 msgid ""
 "\n"
@@ -2581,7 +1487,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../src/gtkblist.c:2580
+#: ../gtk/gtkblist.c:2652
 #, c-format
 msgid ""
 "\n"
@@ -2590,7 +1496,7 @@
 "\n"
 "<b>Alcume de amigo:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2599,7 +1505,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2601
+#: ../gtk/gtkblist.c:2673
 #, c-format
 msgid ""
 "\n"
@@ -2608,7 +1514,7 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2612
+#: ../gtk/gtkblist.c:2684
 #, c-format
 msgid ""
 "\n"
@@ -2617,7 +1523,7 @@
 "\n"
 "<b>Inactivo:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../gtk/gtkblist.c:2719
 #, c-format
 msgid ""
 "\n"
@@ -2626,7 +1532,7 @@
 "\n"
 "<b>Visto por última vez</b> fai %s"
 
-#: ../src/gtkblist.c:2656
+#: ../gtk/gtkblist.c:2728
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2634,7 +1540,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2667
+#: ../gtk/gtkblist.c:2739
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2642,7 +1548,7 @@
 "\n"
 "<b>Descrición:</b> Terrorífica"
 
-#: ../src/gtkblist.c:2669
+#: ../gtk/gtkblist.c:2741
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2650,7 +1556,7 @@
 "\n"
 "<b>Estado</b>: Xenial"
 
-#: ../src/gtkblist.c:2671
+#: ../gtk/gtkblist.c:2743
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2658,120 +1564,146 @@
 "\n"
 "<b>Estado</b>: Rock & roll"
 
-#: ../src/gtkblist.c:2962
+#: ../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:5446
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../gtk/gtkblist.c:3226
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../src/gtkblist.c:2964
+#: ../gtk/gtkblist.c:3228
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1805
+#: ../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:2825
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../src/gtkblist.c:3099
+#: ../gtk/gtkblist.c:3359
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Mensaxe instantánea _nova..."
 
-#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
+#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un Chat..."
 
-#: ../src/gtkblist.c:3101
+#: ../gtk/gtkblist.c:3361
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obter información do usuario..."
 
-#: ../src/gtkblist.c:3102
+#: ../gtk/gtkblist.c:3362
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Engadir un amigo..."
 
-#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
+#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Engadir un Chat..."
 
-#: ../src/gtkblist.c:3104
+#: ../gtk/gtkblist.c:3364
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Engadir un grupo..."
 
-#: ../src/gtkblist.c:3139
+#: ../gtk/gtkblist.c:3399
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ferramentas/Avisos de amigo"
 
-#: ../src/gtkblist.c:3142
+#: ../gtk/gtkblist.c:3402
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../src/gtkblist.c:3145
+#: ../gtk/gtkblist.c:3405
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../src/gtkblist.c:3339
+#: ../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 mensaxe sen ler de %s\n"
+msgstr[1] "%d mensaxes sen ler de %s\n"
+
+#: ../gtk/gtkblist.c:3577
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3579
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../src/gtkblist.c:3342
+#: ../gtk/gtkblist.c:3580
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3343
+#: ../gtk/gtkblist.c:3581
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../src/gtkblist.c:3544 ../src/gtkconn.c:184
+#: ../gtk/gtkblist.c:3789 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../src/gtkblist.c:3553 ../src/protocols/sametime/sametime.c:3622
+#: ../gtk/gtkblist.c:3798 ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtkblist.c:3553
+#: ../gtk/gtkblist.c:3798
 msgid "Re-enable Account"
 msgstr "Re-activar conta"
 
-#: ../src/gtkblist.c:3574
+#: ../gtk/gtkblist.c:3819
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../src/gtkblist.c:3701
+#: ../gtk/gtkblist.c:3948
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3806
+#: ../gtk/gtkblist.c:4109
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Amosar amigos desconectados"
 
-#: ../src/gtkblist.c:3809
+#: ../gtk/gtkblist.c:4112
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Amosar grupos baleiros"
 
-#: ../src/gtkblist.c:3815
+#: ../gtk/gtkblist.c:4118
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Amosar detalles de amigos"
 
-#: ../src/gtkblist.c:3818
+#: ../gtk/gtkblist.c:4121
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Amosar tempos de ausencia"
 
-#: ../src/gtkblist.c:4554
+#: ../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 "Amigos"
+
+#: ../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. "
@@ -2781,26 +1713,23 @@
 "Pode, opcionalmente, introducir un alias ou alcume. O alcume mostrarase en "
 "lugar do nome de usuario sempre que sexa posible.\n"
 
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4624 ../src/gtkblist.c:4943
-msgid "Account:"
-msgstr "Conta:"
-
-#: ../src/gtkblist.c:4876
+#: ../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 "Grupo:"
+
+#: ../gtk/gtkblist.c:5241
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non está soportado nas salas de chats."
 
-#: ../src/gtkblist.c:4892
+#: ../gtk/gtkblist.c:5257
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Non está conectado con ningunha conta que teña capacidade de acceder a chats."
 
-#: ../src/gtkblist.c:4909
-msgid "Add Chat"
-msgstr "Engadir Chat"
-
-#: ../src/gtkblist.c:4933
+#: ../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"
@@ -2808,40 +1737,35 @@
 "Introduza un alcume, e a información que crea apropiada do chat que "
 "desexaría engadir na lista de amigos.\n"
 
-#: ../src/gtkblist.c:5015 ../src/protocols/sametime/sametime.c:5311
-#: ../src/protocols/sametime/sametime.c:5398
-msgid "Add Group"
-msgstr "Engadir grupo"
-
-#: ../src/gtkblist.c:5016
+#: ../gtk/gtkblist.c:5381
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo a engadir."
 
-#: ../src/gtkblist.c:5635
+#: ../gtk/gtkblist.c:6007
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674 ../src/gtkconv.c:2753
+#: ../gtk/gtkblist.c:6040 ../gtk/gtkblist.c:6046 ../gtk/gtkconv.c:2839
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../src/gtkblist.c:5682
+#: ../gtk/gtkblist.c:6054
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/gtkblist.c:5694
+#: ../gtk/gtkblist.c:6066
 msgid "Enable Account"
 msgstr "Activar conta"
 
-#: ../src/gtkblist.c:5747
+#: ../gtk/gtkblist.c:6119
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../src/gtkblist.c:5833
+#: ../gtk/gtkblist.c:6205
 msgid "/Buddies/Sort Buddies"
-msgstr "/Amigos/Ordenar amigos"
-
-#: ../src/gtkconn.c:185
+msgstr "/Amigos/Arranxar amigos"
+
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2852,60 +1776,20 @@
 "Gaim non tentará reconectarse a esta conta ata que corrixa o erro e reactive "
 "a conta."
 
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are:  version"
-msgstr "As opcións de depuración soportadas son:  version"
-
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "Non existe o comando (neste contexto)."
-
-#: ../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 ""
-"Usar \"/help &lt;comando&gt;\" para obter axuda dun comando específico.\n"
-"Os seguintes comandos está dispoñibles neste contexto:\n"
-
-#: ../src/gtkconv.c:482
-msgid "No such command."
-msgstr "Non existe o comando."
-
-#: ../src/gtkconv.c:489
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Erro de sintase: Escribiu suficientes argumentos para ese comando."
-
-#: ../src/gtkconv.c:494
-msgid "Your command failed for an unknown reason."
-msgstr "Seu comando fallou por motivos descoñecidos."
-
-#: ../src/gtkconv.c:501
-msgid "That command only works in chats, not IMs."
-msgstr "Ese comando só funciona en chats, non en MIs."
-
-#: ../src/gtkconv.c:504
-msgid "That command only works in IMs, not chats."
-msgstr "Ese comando só funciona en MIs, non en chats."
-
-#: ../src/gtkconv.c:508
-msgid "That command doesn't work on this protocol."
-msgstr "Ese comando só funciona neste protocolo."
-
-#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
+#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
 
-#: ../src/gtkconv.c:763
+#: ../gtk/gtkconv.c:766
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Non está conectado con ningunha conta coa que poida invitar a ese amigo."
 
-#: ../src/gtkconv.c:816
+#: ../gtk/gtkconv.c:819
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo á sala de Chat"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:846
+#: ../gtk/gtkconv.c:849
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2913,697 +1797,706 @@
 "Introduza o nome de usuario ao que desexa invitar, xunto cunha mensaxe de "
 "invitación opcional."
 
-#: ../src/gtkconv.c:867
+#: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
-#: ../src/gtksavedstatuses.c:1443
+#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:490
+#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
 
-#: ../src/gtkconv.c:950
+#: ../gtk/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversacións con %s</h1>\n"
 
-#: ../src/gtkconv.c:974
+#: ../gtk/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Gardar conversación"
 
-#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Termo a _buscar:"
 
-#: ../src/gtkconv.c:1292
+#: ../gtk/gtkconv.c:1321
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
 "desta conversación."
 
-#: ../src/gtkconv.c:1300
+#: ../gtk/gtkconv.c:1329
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Deteuse o rexistro. Non se rexistrarán mensaxes desta conversación de agora "
 "endiante."
 
-#: ../src/gtkconv.c:1562
-msgid "IM"
-msgstr "MI"
-
-#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
-msgid "Send File"
-msgstr "Enviar ficheiro"
-
-#: ../src/gtkconv.c:1588
+#: ../gtk/gtkconv.c:1597
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../src/gtkconv.c:1591
+#: ../gtk/gtkconv.c:1600
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1601
-msgid "Info"
-msgstr "Info"
-
-#: ../src/gtkconv.c:1611
+#: ../gtk/gtkconv.c:1620
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/gtkconv.c:1634
+#: ../gtk/gtkconv.c:1643
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../src/gtkconv.c:2378
+#: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas ao disco."
 
-#: ../src/gtkconv.c:2402
+#: ../gtk/gtkconv.c:2479
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../src/gtkconv.c:2451
+#: ../gtk/gtkconv.c:2528
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2456
+#: ../gtk/gtkconv.c:2533
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../src/gtkconv.c:2462
+#: ../gtk/gtkconv.c:2536
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
+#: ../gtk/gtkconv.c:2540
+msgid "Set Custom Icon..."
+msgstr "Establecer icona personalizada..."
+
+#: ../gtk/gtkconv.c:2547
+msgid "Remove Custom Icon"
+msgstr "Eliminar icona personalizada"
+
 #. Conversation menu
-#: ../src/gtkconv.c:2602
+#: ../gtk/gtkconv.c:2688
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../src/gtkconv.c:2604
+#: ../gtk/gtkconv.c:2690
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/_Mensaxe instantánea nova..."
 
-#: ../src/gtkconv.c:2609
+#: ../gtk/gtkconv.c:2695
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2697
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _rexistro"
 
-#: ../src/gtkconv.c:2612
+#: ../gtk/gtkconv.c:2698
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Gardar como..."
 
-#: ../src/gtkconv.c:2614
+#: ../gtk/gtkconv.c:2700
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/_Limpar deslizante"
 
-#: ../src/gtkconv.c:2618
+#: ../gtk/gtkconv.c:2704
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar ficheiro..."
 
-#: ../src/gtkconv.c:2619
+#: ../gtk/gtkconv.c:2705
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Engadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2621
+#: ../gtk/gtkconv.c:2707
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obter información"
 
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2711
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Máis"
 
-#: ../src/gtkconv.c:2629
+#: ../gtk/gtkconv.c:2715
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/Alc_ume..."
 
-#: ../src/gtkconv.c:2631
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../src/gtkconv.c:2633
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Engadir..."
 
-#: ../src/gtkconv.c:2635
+#: ../gtk/gtkconv.c:2721
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/El_iminar..."
 
-#: ../src/gtkconv.c:2640
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Inserir li_gazón..."
 
-#: ../src/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Inserir ima_xe..."
 
-#: ../src/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2733
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Pechar"
 
 #. Options
-#: ../src/gtkconv.c:2651
+#: ../gtk/gtkconv.c:2737
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../src/gtkconv.c:2652
+#: ../gtk/gtkconv.c:2738
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../src/gtkconv.c:2653
+#: ../gtk/gtkconv.c:2739
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../src/gtkconv.c:2654
+#: ../gtk/gtkconv.c:2740
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcións/Amosar _iconas dos amigos"
 
-#: ../src/gtkconv.c:2656
+#: ../gtk/gtkconv.c:2742
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Amosar _barra de formato"
 
-#: ../src/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2743
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Amosar _marcas de tempo"
 
-#: ../src/gtkconv.c:2732
+#: ../gtk/gtkconv.c:2818
 msgid "/Conversation/More"
 msgstr "/Conversación/Máis"
 
-#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+#. 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 "/Conversación"
 
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2903
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver rexistro"
 
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2909
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar ficheiro..."
 
-#: ../src/gtkconv.c:2817
+#: ../gtk/gtkconv.c:2913
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Engadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2823
+#: ../gtk/gtkconv.c:2919
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obter información"
 
-#: ../src/gtkconv.c:2827
+#: ../gtk/gtkconv.c:2923
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../src/gtkconv.c:2833
+#: ../gtk/gtkconv.c:2929
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Alcume..."
 
-#: ../src/gtkconv.c:2837
+#: ../gtk/gtkconv.c:2933
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../src/gtkconv.c:2841
+#: ../gtk/gtkconv.c:2937
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Engadir..."
 
-#: ../src/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2941
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../src/gtkconv.c:2851
+#: ../gtk/gtkconv.c:2947
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversación/Inserir ligazón..."
 
-#: ../src/gtkconv.c:2855
+#: ../gtk/gtkconv.c:2951
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversación/Inserir imaxe..."
 
-#: ../src/gtkconv.c:2861
+#: ../gtk/gtkconv.c:2957
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../src/gtkconv.c:2864
+#: ../gtk/gtkconv.c:2960
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../src/gtkconv.c:2877
+#: ../gtk/gtkconv.c:2973
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Amosar barra de formato"
 
-#: ../src/gtkconv.c:2880
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Amosar marcas de tempo"
 
-#: ../src/gtkconv.c:2883
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcións/Amosar iconas dos amigos"
 
-#: ../src/gtkconv.c:2963
+#: ../gtk/gtkconv.c:3055
 msgid "User is typing..."
 msgstr "O usuario está escribindo..."
 
-#: ../src/gtkconv.c:2966
+#: ../gtk/gtkconv.c:3058
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3149
+#: ../gtk/gtkconv.c:3241
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3801
+#: ../gtk/gtkconv.c:3943
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
+#: ../gtk/gtkconv.c:3997 ../libgaim/protocols/sametime/sametime.c:3557
 msgid "Topic:"
 msgstr "Tópico:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3908
+#: ../gtk/gtkconv.c:4049
 msgid "0 people in room"
 msgstr "0 persoas na conversación"
 
-#: ../src/gtkconv.c:3987
-msgid "IM the user"
-msgstr "Enviar un MI ao usuario"
-
-#: ../src/gtkconv.c:4000
-msgid "Ignore the user"
-msgstr "Ignorar ao usuario"
-
-#: ../src/gtkconv.c:4012
-msgid "Get the user's information"
-msgstr "Obter a información do usuario"
-
-#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
+#: ../gtk/gtkconv.c:5096 ../gtk/gtkconv.c:5217
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na conversación"
 msgstr[1] "%d persoas na conversación"
 
-#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5770 ../gtk/gtkstatusbox.c:541
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../src/gtkconv.c:5670
+#: ../gtk/gtkconv.c:5776
 msgid "Stopped Typing"
 msgstr "Deixa de escribir"
 
-#: ../src/gtkconv.c:5675
+#: ../gtk/gtkconv.c:5781
 msgid "Nick Said"
 msgstr "Alcume"
 
-#: ../src/gtkconv.c:5685
+#: ../gtk/gtkconv.c:5786 ../gtk/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Mensaxes sen ler"
+
+#: ../gtk/gtkconv.c:5791
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../src/gtkconv.c:6575
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
-"un comando."
-
-#: ../src/gtkconv.c:6578
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;acción&gt;:  Enviar unha acción estilo IRC a un amigo ou a un chat."
-
-#: ../src/gtkconv.c:6581
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;opción&gt;:  Enviar información de depuración sobre a conversación "
-"actual."
-
-#: ../src/gtkconv.c:6584
-msgid "clear: Clears the conversation scrollback."
-msgstr "limpar: Limpa a conversación desprazada."
-
-#: ../src/gtkconv.c:6587
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;comando&gt;:  Recibir axuda dun comando específico."
-
-#: ../src/gtkconv.c:6746
+#: ../gtk/gtkconv.c:6905
 msgid "Confirm close"
 msgstr "Confirmar peche"
 
-#: ../src/gtkconv.c:6778
+#: ../gtk/gtkconv.c:6937
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Ten mensaxes sen ler. Está seguro que quere pechar a fiestra?"
 
-#: ../src/gtkconv.c:7300
+#: ../gtk/gtkconv.c:7472
 msgid "Close other tabs"
 msgstr "Pechar outras solapas"
 
-#: ../src/gtkconv.c:7306
+#: ../gtk/gtkconv.c:7478
 msgid "Close all tabs"
 msgstr "Pechar todas as solapas"
 
-#: ../src/gtkconv.c:7314
+#: ../gtk/gtkconv.c:7486
 msgid "Detach this tab"
 msgstr "Desacoplar esta solapa"
 
-#: ../src/gtkconv.c:7320
+#: ../gtk/gtkconv.c:7492
 msgid "Close this tab"
 msgstr "Pechar esta solapa"
 
-#: ../src/gtkconv.c:7580
+#: ../gtk/gtkconv.c:7760
 msgid "Close conversation"
 msgstr "Pechar conversación"
 
-#: ../src/gtkconv.c:8044
+#: ../gtk/gtkconv.c:8224
 msgid "Last created window"
 msgstr "Última fiestra creada"
 
-#: ../src/gtkconv.c:8046
+#: ../gtk/gtkconv.c:8226
 msgid "Separate IM and Chat windows"
 msgstr "Separar fiestras de MIs e Chats"
 
-#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
+#: ../gtk/gtkconv.c:8228 ../gtk/gtkprefs.c:1297
 msgid "New window"
 msgstr "Nova fiestra"
 
-#: ../src/gtkconv.c:8050
+#: ../gtk/gtkconv.c:8230
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:8052
+#: ../gtk/gtkconv.c:8232
 msgid "By account"
 msgstr "Por conta"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Gardar rexistro de depuración"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Invertir"
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Coincidencias resaltadas"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Fiestra de depuración"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Limpar"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Pausar"
-
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Marcas de tempo"
-
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "Só _icona"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "Só _texto"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Tanto iconas como texto"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Premer co botón dereito para máis opcións."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Nivel "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Seleccione o nivel de filtrado de depuración"
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "Todo"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Misceláneo"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Aviso"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Erro "
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Erro fatal"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
-msgstr "desenrolador principal"
-
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+msgstr "desenvolvedor principal"
+
+#: ../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 "desenrolador"
-
-#: ../src/gtkdialogs.c:64
+msgstr "desenvolvedor"
+
+#: ../gtk/gtkdialogs.c:72
+msgid "developer & webmaster"
+msgstr "desenvolvedor e webmaster"
+
+#: ../gtk/gtkdialogs.c:79
+msgid "support"
+msgstr "soporte"
+
+#: ../gtk/gtkdialogs.c:101
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../src/gtkdialogs.c:67
-msgid "developer & webmaster"
-msgstr "desenrolador e webmaster"
-
-#: ../src/gtkdialogs.c:74
-msgid "support"
-msgstr "soporte"
-
-#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "mantedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e deseñador de controladores [lazy bum]"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
-msgstr "desenrolador de Jabber"
-
-#: ../src/gtkdialogs.c:103
+msgstr "desenvolvedor de Jabber"
+
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "Árabe"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:186
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../src/gtkdialogs.c:114
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:187 ../gtk/gtkdialogs.c:188
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
 msgstr "Valenciano"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:189
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Danés"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:190
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../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 "Español"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
 msgid "Euskera(Basque)"
 msgstr "Euskera"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139
 msgid "Persian"
 msgstr "Perso"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
-#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
 msgid "French"
 msgstr "Francés"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:142
 msgid "Galician"
 msgstr "Galego"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:144
+msgid "Gujarati"
+msgstr "Guxarati"
+
+#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:146
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../src/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:147
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:202
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
-#: ../src/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:205
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:206
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../src/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:156
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:157
+msgid "Nepali"
+msgstr "Nepalí"
+
+#: ../gtk/gtkdialogs.c:158
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:159
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:210
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:162
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:163
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileiro"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:164
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:211 ../gtk/gtkdialogs.c:212
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:167
 msgid "Serbian"
 msgstr "Servio"
 
-#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:213
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:169
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:170
+msgid "Albanian"
+msgstr "Albano"
+
+#: ../gtk/gtkdialogs.c:171 ../gtk/gtkdialogs.c:214
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:172
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:173
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:174
 msgid "Thai"
 msgstr "Thai"
 
-#: ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:175
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:176
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:176
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:215
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:216
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../src/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:185
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../src/gtkdialogs.c:245
+#: ../gtk/gtkdialogs.c:297
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:269
+#: ../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 é un cliente modular de mensaxería instantánea, capaz de utilizar AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, "
 "Napster, Zephyr, e Gadu-Gadu ao mesmo tempo. Está escrito usando Gtk+."
 "<BR><BR> Pode modificar eredistribuir este programa baixo os termos da GPL "
 "(versión 2 ou posterior). Inclúeseunha copia da licencia GPL no ficheiro "
@@ -3612,59 +2505,43 @@
 "lista completa de persoas que contribuíron. Este programa distribúese "
 "senningunha garantía.<BR><BR>"
 
-#: ../src/gtkdialogs.c:283
+#: ../gtk/gtkdialogs.c:346
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:286
+#: ../gtk/gtkdialogs.c:349
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:292
+#: ../gtk/gtkdialogs.c:355
 msgid "Current Developers"
-msgstr "Desenroladores actuais"
-
-#: ../src/gtkdialogs.c:307
+msgstr "Desenvolvedores actuais"
+
+#: ../gtk/gtkdialogs.c:370
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:385
 msgid "Retired Developers"
-msgstr "Desenroladores retirados"
-
-#: ../src/gtkdialogs.c:337
+msgstr "Desenvolvedores retirados"
+
+#: ../gtk/gtkdialogs.c:400
 msgid "Current Translators"
-msgstr "Traductores actuais"
-
-#: ../src/gtkdialogs.c:357
+msgstr "Tradutores actuais"
+
+#: ../gtk/gtkdialogs.c:420
 msgid "Past Translators"
-msgstr "Traductores anteriores"
-
-#: ../src/gtkdialogs.c:375
+msgstr "Tradutores anteriores"
+
+#: ../gtk/gtkdialogs.c:438
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
-msgid "_Name"
-msgstr "_Nome"
-
-#: ../src/gtkdialogs.c:594 ../src/gtkdialogs.c:731 ../src/gtkdialogs.c:794
-msgid "_Account"
-msgstr "_Conta"
-
-#: ../src/gtkdialogs.c:602
-msgid "New Instant Message"
-msgstr "Mensaxe instantánea nova"
-
-#: ../src/gtkdialogs.c:604
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
-
-#: ../src/gtkdialogs.c:739
+#: ../gtk/gtkdialogs.c:812
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../src/gtkdialogs.c:741
+#: ../gtk/gtkdialogs.c:814
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3672,11 +2549,11 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "información."
 
-#: ../src/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:903
 msgid "View User Log"
 msgstr "Ver rexistro de usuario"
 
-#: ../src/gtkdialogs.c:805
+#: ../gtk/gtkdialogs.c:905
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3684,37 +2561,32 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "información de rexistro."
 
-#: ../src/gtkdialogs.c:824
+#: ../gtk/gtkdialogs.c:924
 msgid "Alias Contact"
 msgstr "Alcume para contacto"
 
-#: ../src/gtkdialogs.c:825
+#: ../gtk/gtkdialogs.c:925
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alcume para este contacto"
 
-#: ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:849 ../src/gtkdialogs.c:869
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
-msgid "Alias"
-msgstr "Alcume"
-
-#: ../src/gtkdialogs.c:845
+#: ../gtk/gtkdialogs.c:945
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alcume para %s."
 
-#: ../src/gtkdialogs.c:847
+#: ../gtk/gtkdialogs.c:947
 msgid "Alias Buddy"
 msgstr "Alcume de amigo"
 
-#: ../src/gtkdialogs.c:866
+#: ../gtk/gtkdialogs.c:966
 msgid "Alias Chat"
 msgstr "Alcume no Chat"
 
-#: ../src/gtkdialogs.c:867
+#: ../gtk/gtkdialogs.c:967
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alcume para este chat."
 
-#: ../src/gtkdialogs.c:904
+#: ../gtk/gtkdialogs.c:1004
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3729,15 +2601,30 @@
 "Está a punto de eliminar o contacto que contén a %s e outros %d amigos da "
 "súalista de amigos. Quere continuar?"
 
-#: ../src/gtkdialogs.c:912
+#: ../gtk/gtkdialogs.c:1012
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../src/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:1013
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../src/gtkdialogs.c:964
+#: ../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 "Está a punto de fusionar o grupo chamado %s co grupo chamado %s. Desexa continuar?"
+
+#: ../gtk/gtkdialogs.c:1050
+msgid "Merge Groups"
+msgstr "Fusionar grupos"
+
+#: ../gtk/gtkdialogs.c:1051
+msgid "_Merge Groups"
+msgstr "_Fusionar grupos"
+
+#: ../gtk/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3746,210 +2633,278 @@
 "Está a punto de borrar o grupo %s xunto con todos seus membros da lista de "
 "amigos. Desexa continuar?"
 
-#: ../src/gtkdialogs.c:967
+#: ../gtk/gtkdialogs.c:1104
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/gtkdialogs.c:968
+#: ../gtk/gtkdialogs.c:1105
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../src/gtkdialogs.c:1001
+#: ../gtk/gtkdialogs.c:1138
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto de eliminar a %s da súa lista de amigos. Quere continuar?"
 
-#: ../src/gtkdialogs.c:1004
+#: ../gtk/gtkdialogs.c:1141
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../src/gtkdialogs.c:1005
+#: ../gtk/gtkdialogs.c:1142
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../src/gtkdialogs.c:1026
+#: ../gtk/gtkdialogs.c:1163
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Está a punto de eliminar o chat %s da súa lista de amigos. Quere continuar?"
 
-#: ../src/gtkdialogs.c:1029
+#: ../gtk/gtkdialogs.c:1166
 msgid "Remove Chat"
 msgstr "Eliminar Chat"
 
-#: ../src/gtkdialogs.c:1030
+#: ../gtk/gtkdialogs.c:1167
 msgid "_Remove Chat"
 msgstr "_Eliminar Chat"
 
-#: ../src/gtkft.c:133
+#: ../gtk/gtkdocklet.c:146
+msgid "Right-click for more unread messages...\n"
+msgstr "Premer co botón dereito para máis mensaxes sen ler...\n"
+
+#: ../gtk/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Cambiar estado"
+
+#: ../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 "Dispoñible"
+
+#. 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:1819 ../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:4407
+#: ../libgaim/protocols/oscar/oscar.c:5474
+#: ../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 "Ausente"
+
+#: ../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 "Amosar lista de amigos"
+
+#: ../gtk/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "Nova mensaxe..."
+
+#: ../gtk/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Sen son"
+
+#: ../gtk/gtkdocklet.c:543
+#, fuzzy
+msgid "Blink on new message"
+msgstr "Mensaxe descoñecida"
+
+#. 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 "Saír"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:153
+#: ../gtk/gtkft.c:153
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/gtkft.c:162 ../src/gtkft.c:1063
+#: ../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 "Descoñecido"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "Rematado"
 
-#: ../src/gtkft.c:165 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../src/gtkft.c:168 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Transferencia de ficheiro - %d%% de %d ficheiros"
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Transferencia de ficheiros"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibindo como:</b>"
 
-#: ../src/gtkft.c:223
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibindo de:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../src/gtkft.c:229
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../src/gtkft.c:445
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
 
-#: ../src/gtkft.c:450
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
 
-#: ../src/gtkft.c:487
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao lanzar %s: %s"
 
-#: ../src/gtkft.c:496
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Erro executando %s"
 
-#: ../src/gtkft.c:497
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "O proceso devolveu un erro de código %d"
 
-#: ../src/gtkft.c:591
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtkft.c:598
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../src/gtkft.c:605
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../src/gtkft.c:612
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Restante"
 
-#: ../src/gtkft.c:643
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Nome de ficheiro:"
 
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Ficheiro local:"
 
-#: ../src/gtkft.c:645
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/gtkft.c:647
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Tempo transcurrido:"
 
-#: ../src/gtkft.c:648
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../src/gtkft.c:710
-msgid "File Transfers"
-msgstr "Transferencia de ficheiros"
-
-#: ../src/gtkft.c:733
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "_Pechar esta fiestra cando rematen todas as transferencias"
 
-#: ../src/gtkft.c:743
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Limpar transferencias rematadas"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:752
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "_Detalles da transferencia de ficheiros"
 
-#. Pause button
-#: ../src/gtkft.c:782 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Pausar"
-
 #. Resume button
-#: ../src/gtkft.c:792
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "Fallou"
 
-#: ../src/gtkimhtml.c:821
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#: ../src/gtkimhtml.c:833
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Reiniciar formatos"
 
-#: ../src/gtkimhtml.c:1327
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Cor de ligazón"
 
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligazóns."
 
-#: ../src/gtkimhtml.c:1331
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón pre-iluminado"
 
-#: ../src/gtkimhtml.c:1332
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligazóns cando o rato esté enriba."
 
-#: ../src/gtkimhtml.c:1553
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar enderezo E-Mail"
 
-#: ../src/gtkimhtml.c:1565
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón en navegador"
 
-#: ../src/gtkimhtml.c:1575
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Copiar destino da ligazón"
 
-#: ../src/gtkimhtml.c:3272
+#: ../gtk/gtkimhtml.c:3298
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3959,7 +2914,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3275
+#: ../gtk/gtkimhtml.c:3301
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3969,7 +2924,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3288
+#: ../gtk/gtkimhtml.c:3314
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3980,7 +2935,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3291
+#: ../gtk/gtkimhtml.c:3317
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3991,35 +2946,35 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
+#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../src/gtkimhtml.c:3411
+#: ../gtk/gtkimhtml.c:3437
 msgid "_Save Image..."
 msgstr "_Gardar imaxe..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Seleccionar fonte"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Seleccionar a cor do texto"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Seleccionar a cor do fondo"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Descrición"
 
-#: ../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."
@@ -4027,99 +2982,99 @@
 "Introduza a URL e a descrición do ligazón que quere inserir. A descrición é "
 "opcional."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduza a URL do ligazón que quere inserir."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Inserir ligazón"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Non se puido almacenar a imaxe: %s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Este tema non ten emoticóns dispoñibles."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Sorisa"
 
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Grosa"
 
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Subraiado"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Tamaño de fonte maior"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Tamaño de fonte menor"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
 msgstr "Estilo da fonte"
 
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Cor do texto"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Cor de fondo"
 
-#: ../src/gtkimhtmltoolbar.c:1030
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "Reiniciar formatos"
 
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Inserir ligazón"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Inserir imaxe"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Inserir emoticón"
 
-#: ../src/gtklog.c:207
+#: ../gtk/gtklog.c:219
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversación en %s de %s</span>"
 
-#: ../src/gtklog.c:212
+#: ../gtk/gtklog.c:224
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversación con %s en %s</span>"
 
-#: ../src/gtklog.c:261
+#: ../gtk/gtklog.c:273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:308
+#: ../gtk/gtklog.c:320
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4127,7 +3082,7 @@
 "Só se rexistrarán os eventos do sistema cando esté activada a opción "
 "\"Rexistrar todos os cambios de estado no rexistro do sistema."
 
-#: ../src/gtklog.c:312
+#: ../gtk/gtklog.c:324
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4135,40 +3090,40 @@
 "Só se rexistrarán as mensaxes instantáneas se está activada a preferencia "
 "\"Rexistrar todas as mensaxes instantáneas\"."
 
-#: ../src/gtklog.c:315
+#: ../gtk/gtklog.c:327
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Os chats só serán rexistrados se a opción \"Rexistrar todos os chats\" está "
 "activada nas preferencias"
 
-#: ../src/gtklog.c:319
+#: ../gtk/gtklog.c:331
 msgid "No logs were found"
 msgstr "Non se atoparon rexistros"
 
-#: ../src/gtklog.c:398
+#: ../gtk/gtklog.c:410
 msgid "Total log size:"
 msgstr "Tamaño total de rexistro:"
 
-#: ../src/gtklog.c:464
+#: ../gtk/gtklog.c:476
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversacións en %s"
 
-#: ../src/gtklog.c:472 ../src/gtklog.c:523
+#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversacións con %s"
 
-#: ../src/gtklog.c:548
+#: ../gtk/gtklog.c:560
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Tente `%s -h' para máis información.\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4194,7 +3149,7 @@
 "                      da conta(s) a suar, separado por comas)\n"
 "  -v, --version       amosar a versión actual e saír\n"
 
-#: ../src/gtkmain.c:492
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4233,34 +3188,22 @@
 "con Sean ou Luke a través doutros protocolos en \n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:329
-msgid "New Mail"
-msgstr "Correo novo"
-
-#: ../src/gtknotify.c:345
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1113
-msgid "From"
-msgstr "De"
-
-#: ../src/gtknotify.c:420
-msgid "Subject"
-msgstr "Asunto"
-
-#: ../src/gtknotify.c:429
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../src/gtknotify.c:495
+#: ../gtk/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe novo."
 msgstr[1] "%s ten %d mensaxes novas."
 
-#: ../src/gtknotify.c:500
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4271,53 +3214,44 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5450
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "Info for %s"
-msgstr "Información sobre %s"
-
-#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Información de amigos"
-
-#: ../src/gtknotify.c:884
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
-#: ../src/gtknotify.c:1034
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "Non se puido abrir a URL"
 
-#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao lanzar \"%s\": %s"
 
-#: ../src/gtknotify.c:1035
+#: ../gtk/gtknotify.c:1046
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Definiuse un comando de navegador 'Manual', pero non se definiu ningún "
 "comando para executalo."
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse múltiples complementos."
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4328,7 +3262,7 @@
 "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4339,201 +3273,205 @@
 "<span·foreground=\"#ff0000\"·weight=\"bold\">Erro:·%s\n"
 "Comprobe o sitio web do complemento para obter unha actualización.</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
-#: ../src/gtkpounce.c:154
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../src/gtkpounce.c:251
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Indique o amigo do que avisar."
 
-#: ../src/gtkpounce.c:495
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Novo aviso de amigo"
 
-#: ../src/gtkpounce.c:495
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:512
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "A quén avisar"
 
-#: ../src/gtkpounce.c:539
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "Nome do _amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:565
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Avisar cando un amigo..."
 
-#: ../src/gtkpounce.c:573
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "_Conectarse"
 
-#: ../src/gtkpounce.c:575
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "_Desconectarse"
 
-#: ../src/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "_Auséntarse"
 
-#: ../src/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_Deixar de estar ausente"
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "Agora está _inactivo"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "_Xa non está inactivo"
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "Comeza a _escribir"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "_Páusase mentras escribe"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "Deixa de escr_ibir"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Enviar unha _mensaxe"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:621
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/gtkpounce.c:629
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "_Abrir unha fiestra de MI"
 
-#: ../src/gtkpounce.c:631
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Notificación cunha fiestra emerxente"
 
-#: ../src/gtkpounce.c:633
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
-#: ../src/gtkpounce.c:635
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "E_xecutar un comando"
 
-#: ../src/gtkpounce.c:637
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
 
-#: ../src/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "Exa_minar..."
 
-#: ../src/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "Exa_minar..."
 
-#: ../src/gtkpounce.c:645
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "Pre_visualizar..."
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:757
-msgid "Options"
-msgstr "Opcións"
-
-#: ../src/gtkpounce.c:765
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "Só _avisar cando o meu estado non está dispoñible"
 
-#: ../src/gtkpounce.c:770
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../src/gtkpounce.c:1074
+#: ../gtk/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Está seguro de que quere borrar o aviso en %s para %s?"
 
-#: ../src/gtkpounce.c:1222
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Obxectivo a avisar"
 
-#: ../src/gtkpounce.c:1257
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../src/gtkpounce.c:1304
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Avisos de amigo"
 
-#: ../src/gtkpounce.c:1431
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s comezou a escribirlle (%s)"
 
-#: ../src/gtkpounce.c:1433
+#: ../gtk/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s pausouse mentras lle escriba algo (%s)"
+
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectouse (%s)"
 
-#: ../src/gtkpounce.c:1435
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volveu da súa inactividade (%s)"
 
-#: ../src/gtkpounce.c:1437
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s deixou de estar ausente (%s)"
 
-#: ../src/gtkpounce.c:1439
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s deixou de escribirlle (%s)"
 
-#: ../src/gtkpounce.c:1441
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectouse (%s)"
 
-#: ../src/gtkpounce.c:1443
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../src/gtkpounce.c:1445
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s marchouse. (%s)"
 
-#: ../src/gtkpounce.c:1447
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso descoñecido. Por favor, informe disto!"
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
 msgstr "Fallou o desempaquetado do tema de emoticóns."
 
-#: ../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."
@@ -4541,52 +3479,130 @@
 "Seleccione da lista inferior o tema de emoticóns que desexe. Pode instalar "
 "temas novos arrastrándoos e soltándoos sobre esta lista de temas."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "Icona"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
-#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
+#: ../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 "Descrición"
 
-#: ../src/gtkprefs.c:821
-msgid "_Hide new IM conversations"
-msgstr "A_gochar conversacións MI novas"
-
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Icona do área de notificación do sistema"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "A_mosar icona do área de notificación do sistema:"
+
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1644
+#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "Sempre"
+
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1809
+#: ../gtk/gtkprefs.c:1823 ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "Nunca"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Nas mensaxes sen ler"
+
+#: ../gtk/gtkprefs.c:826
+#, fuzzy
+msgid "Conversation Window Hiding"
+msgstr "Fiestras de conversación de MI"
+
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "A_gochar conversacións MI novas:"
+
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1824
 msgid "When away"
 msgstr "Cando está ausente"
 
-#: ../src/gtkprefs.c:828
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Enviar comandos \"_slash\" descoñecidas como mensaxes"
-
-#: ../src/gtkprefs.c:830
+#. All the tab options!
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Tabulacións"
+
+#: ../gtk/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Amosar MIs e chats en fiestras con _solapas"
+
+#: ../gtk/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Amosar botóns de _peche nas solapas"
+
+#: ../gtk/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Ubicación:"
+
+#: ../gtk/gtkprefs.c:859
+msgid "Top"
+msgstr "Enriba"
+
+#: ../gtk/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Abaixo"
+
+#: ../gtk/gtkprefs.c:861
+msgid "Left"
+msgstr "Esquerda"
+
+#: ../gtk/gtkprefs.c:862
+msgid "Right"
+msgstr "Dereita"
+
+#: ../gtk/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Vertical esquerda"
+
+#: ../gtk/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Vertical dereita"
+
+#: ../gtk/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "Conversacións _novas:"
+
+#: ../gtk/gtkprefs.c:900
 msgid "Show _formatting on incoming messages"
 msgstr "Amosar _formato nas mensaxes entrantes"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:903
 msgid "Show buddy _icons"
 msgstr "Amosar _iconas dos amigos"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:905
 msgid "Enable buddy ic_on animation"
 msgstr "Activar animacións nas i_conas de amigos"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:912
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar aos amigos cando lles está escribindo"
 
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:915
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar as faltas de ortografía"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:919
 msgid "Use smooth-scrolling"
 msgstr "Usar desprazamento suave"
 
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Destello de fiestra cando se reciben MIs"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Formato predeterminado"
+
+#: ../gtk/gtkprefs.c:941
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4594,165 +3610,124 @@
 "Desta forma verase o texto das súas mensaxes saíntes cando empregue "
 "protocolos que soportan formatos. :)"
 
-#. All the tab options!
-#: ../src/gtkprefs.c:887
-msgid "Tab Options"
-msgstr "Opcións das solapas"
-
-#: ../src/gtkprefs.c:889
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Amosar MIs e chats en fiestras con _solapas"
-
-#: ../src/gtkprefs.c:903
-msgid "Show close b_utton on tabs"
-msgstr "Amosar botóns de _peche nas solapas"
-
-#: ../src/gtkprefs.c:909
-msgid "_Placement:"
-msgstr "_Ubicación:"
-
-#: ../src/gtkprefs.c:911
-msgid "Top"
-msgstr "Enriba"
-
-#: ../src/gtkprefs.c:912
-msgid "Bottom"
-msgstr "Abaixo"
-
-#: ../src/gtkprefs.c:913
-msgid "Left"
-msgstr "Esquerda"
-
-#: ../src/gtkprefs.c:914
-msgid "Right"
-msgstr "Dereita"
-
-#: ../src/gtkprefs.c:916
-msgid "Left Vertical"
-msgstr "Vertical esquerda"
-
-#: ../src/gtkprefs.c:917
-msgid "Right Vertical"
-msgstr "Vertical dereita"
-
-#: ../src/gtkprefs.c:922
-msgid "N_ew conversations:"
-msgstr "Conversacións _novas:"
-
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:3631
+#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3628
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:1012
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../src/gtkprefs.c:987
+#: ../gtk/gtkprefs.c:1024
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Examplo: stunserver.org</span>"
 
-#: ../src/gtkprefs.c:991
+#: ../gtk/gtkprefs.c:1028
 msgid "_Autodetect IP address"
 msgstr "_Autodetectar enderezo IP"
 
-#: ../src/gtkprefs.c:1000
+#: ../gtk/gtkprefs.c:1037
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../src/gtkprefs.c:1029
+#: ../gtk/gtkprefs.c:1066
 msgid "Ports"
 msgstr "Portos"
 
-#: ../src/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1069
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o rango de portos no que se escoitará"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1072
 msgid "_Start port:"
 msgstr "Porto _inicial:"
 
-#: ../src/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1079
 msgid "_End port:"
 msgstr "Porto _final:"
 
-#: ../src/gtkprefs.c:1050
+#: ../gtk/gtkprefs.c:1087
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../src/gtkprefs.c:1054
+#: ../gtk/gtkprefs.c:1091
 msgid "No proxy"
 msgstr "Sen proxy"
 
-#: ../src/gtkprefs.c:1110
+#: ../gtk/gtkprefs.c:1147
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../src/gtkprefs.c:1172
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1173
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1174
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1175
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1176
-msgid "GNOME Default"
-msgstr "Predeterminado de Gnome"
-
-#: ../src/gtkprefs.c:1177
+#: ../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"
+
+#: ../gtk/gtkprefs.c:1214
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1178
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../src/gtkprefs.c:1179
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1180
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1215
+msgid "GNOME Default"
+msgstr "Predeterminado de Gnome"
+
+#: ../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:1242
+#: ../gtk/gtkprefs.c:1281
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../src/gtkprefs.c:1246
+#: ../gtk/gtkprefs.c:1285
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkprefs.c:1254
+#: ../gtk/gtkprefs.c:1293
 msgid "_Open link in:"
 msgstr "_Abrir ligazón en:"
 
-#: ../src/gtkprefs.c:1256
+#: ../gtk/gtkprefs.c:1295
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../src/gtkprefs.c:1257
+#: ../gtk/gtkprefs.c:1296
 msgid "Existing window"
 msgstr "Fiestra existente"
 
-#: ../src/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1298
 msgid "New tab"
 msgstr "Nova solapa"
 
-#: ../src/gtkprefs.c:1273
+#: ../gtk/gtkprefs.c:1312
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4761,83 +3736,79 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
-msgid "Logging"
-msgstr "Rexistro"
-
-#: ../src/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1352
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
-#: ../src/gtkprefs.c:1317
+#: ../gtk/gtkprefs.c:1357
 msgid "Log all _instant messages"
 msgstr "Rexistrar todas as mensaxes _instantáneas"
 
-#: ../src/gtkprefs.c:1319
+#: ../gtk/gtkprefs.c:1359
 msgid "Log all c_hats"
 msgstr "Rexistrar todas as _conversacións"
 
-#: ../src/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1361
 msgid "Log all _status changes to system log"
 msgstr "Rexistrar todos os cambios de e_stado no rexistro do sistema"
 
-#: ../src/gtkprefs.c:1469
+#: ../gtk/gtkprefs.c:1509
 msgid "Sound Selection"
 msgstr "Selección de son"
 
-#: ../src/gtkprefs.c:1477
+#: ../gtk/gtkprefs.c:1517
 msgid "Quietest"
 msgstr "O máis silencioso"
 
-#: ../src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1519
 msgid "Quieter"
 msgstr "Máis silencioso"
 
-#: ../src/gtkprefs.c:1481
+#: ../gtk/gtkprefs.c:1521
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1523 ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/gtkprefs.c:1485
+#: ../gtk/gtkprefs.c:1525
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../src/gtkprefs.c:1487
+#: ../gtk/gtkprefs.c:1527
 msgid "Louder"
 msgstr "Máis ruidoso"
 
-#: ../src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1529
 msgid "Loudest"
 msgstr "O máis ruidoso"
 
-#: ../src/gtkprefs.c:1552
+#: ../gtk/gtkprefs.c:1592
 msgid "Sound Method"
 msgstr "Método para reproducir sons"
 
-#: ../src/gtkprefs.c:1553
+#: ../gtk/gtkprefs.c:1593
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../src/gtkprefs.c:1555
+#: ../gtk/gtkprefs.c:1595
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: ../src/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1597
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1602
 msgid "Command"
 msgstr "Comando"
 
-#: ../src/gtkprefs.c:1563
+#: ../gtk/gtkprefs.c:1603
 msgid "No sounds"
 msgstr "Sen sons"
 
-#: ../src/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1611
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4846,197 +3817,210 @@
 "C_omando para son:\n"
 "(%s para nome de ficheiro)"
 
-#: ../src/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1637
 msgid "Sound Options"
 msgstr "Opcións de son"
 
-#: ../src/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1638
 msgid "Sounds when conversation has _focus"
 msgstr "Soa cando a conversación obtén o _foco"
 
-#: ../src/gtkprefs.c:1600
-msgid "_Sounds while away"
-msgstr "_Sons cando está ausente"
-
-#: ../src/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1640
+msgid "Enable sounds:"
+msgstr "Activar sons:"
+
+#: ../gtk/gtkprefs.c:1642
+msgid "Only when available"
+msgstr "Só cando esté dispoñible"
+
+#: ../gtk/gtkprefs.c:1643
+msgid "Only when not available"
+msgstr "Só cando non esté dispoñible"
+
+#: ../gtk/gtkprefs.c:1651
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../src/gtkprefs.c:1635
+#: ../gtk/gtkprefs.c:1679
 msgid "Sound Events"
 msgstr "Eventos de son"
 
-#: ../src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1730
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../src/gtkprefs.c:1693
+#: ../gtk/gtkprefs.c:1737
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/gtkprefs.c:1712
+#: ../gtk/gtkprefs.c:1756
 msgid "Test"
 msgstr "Probar"
 
-#: ../src/gtkprefs.c:1716
+#: ../gtk/gtkprefs.c:1760
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../src/gtkprefs.c:1720
+#: ../gtk/gtkprefs.c:1764
 msgid "Choose..."
 msgstr "Escoller..."
 
-#: ../src/gtkprefs.c:1762
+#: ../gtk/gtkprefs.c:1807
 msgid "_Report idle time:"
 msgstr "Amosar o _tempo de inactividade:"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1810
 msgid "From last sent message"
 msgstr "Da última mensaxe enviada"
 
-#: ../src/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1812
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado no teclado ou no uso do rato"
 
-#: ../src/gtkprefs.c:1776
+#: ../gtk/gtkprefs.c:1821
 msgid "_Auto-reply:"
 msgstr "Resposta _automática:"
 
-#: ../src/gtkprefs.c:1780
+#: ../gtk/gtkprefs.c:1825
 msgid "When both away and idle"
 msgstr "Cando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1786
+#: ../gtk/gtkprefs.c:1831
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../src/gtkprefs.c:1788
+#: ../gtk/gtkprefs.c:1833
 msgid "Change status when _idle"
 msgstr "Cambiar o estado cando esté _inactivo"
 
-#: ../src/gtkprefs.c:1792
+#: ../gtk/gtkprefs.c:1837
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de cambiar o estado:"
 
-#: ../src/gtkprefs.c:1800
+#: ../gtk/gtkprefs.c:1845
 msgid "Change _status to:"
 msgstr "Cambiar e_stado a:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1821
-msgid "Status at startup"
+#: ../gtk/gtkprefs.c:1866
+msgid "Status at Startup"
 msgstr "Estado para o inicio"
 
-#: ../src/gtkprefs.c:1823
+#: ../gtk/gtkprefs.c:1868
 msgid "Use status from last _exit at startup"
 msgstr "Empregar o estado da última _saída ao comezar"
 
-#: ../src/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1874
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar ao comezar:"
 
-#: ../src/gtkprefs.c:1880
+#: ../gtk/gtkprefs.c:1912
+msgid "Interface"
+msgstr "Interface"
+
+#: ../gtk/gtkprefs.c:1914
 msgid "Smiley Themes"
 msgstr "Temas de emoticóns"
 
-#: ../src/gtkprefs.c:1881
+#: ../gtk/gtkprefs.c:1915
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
+#: ../gtk/gtkprefs.c:1916 ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "Rede"
 
-#: ../src/gtkprefs.c:1887
+#: ../gtk/gtkprefs.c:1921
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../src/gtkprefs.c:1891
-msgid "Away / Idle"
-msgstr "Ausencia / Inactividade"
-
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprefs.c:1925
+#, fuzzy
+msgid "Status / Idle"
+msgstr "Estado"
+
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permitir a todos os usuarios que contacten comigo"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir só aos usuarios na miña lista de amigos"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Permitir só aos seguintes usuarios"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloquear todos os usuarios"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquear só os seguintes usuarios"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Os cambios á configuración de privacidade teñen efecto inmediatamente."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Establecer privacidade para:"
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permitir ao usuario"
 
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario ao que lle permita contactar con vostede."
 
-#: ../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 "Introduza o nome de usuario ao que quere permitir que contacte con vostede."
 
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir a %s contactar con vostede?"
 
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Está seguro que quere permitir que %s contacte con vostede?"
 
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquear ao usuario"
 
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: ../src/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduza o nome do usuario a bloquear."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Está seguro de que quere bloquear a %s?"
@@ -5044,250 +4028,188 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
-#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../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 "Si"
 
-#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
-#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../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 "Non"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:350
-msgid "Close"
-msgstr "Pechar"
-
-#: ../src/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
 msgstr "Escoller un novo nome"
 
-#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
-#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
 msgstr "Seleccionar cartafol..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "_Obter a lista"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "_Engadir Chat"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
-#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "Título"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Tipo"
-
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
-#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
-#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227 ../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
-#: ../src/protocols/jabber/jabber.c:1232 ../src/protocols/novell/novell.c:2866
-#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5366
-#: ../src/protocols/oscar/oscar.c:5381 ../src/protocols/oscar/oscar.c:5386
-#: ../src/protocols/oscar/oscar.c:5594 ../src/protocols/oscar/oscar.c:5606
-#: ../src/protocols/sametime/sametime.c:3266
-#: ../src/protocols/sametime/sametime.c:3272
-#: ../src/protocols/sametime/sametime.c:3278
-#: ../src/protocols/sametime/sametime.c:3357
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "Mensaxe"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Estados gardados"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "O título xa está en uso. Debe escoller un título único."
 
-#: ../src/gtksavedstatuses.c:879
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Diferente"
 
-#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
-#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
-#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
-#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/msn/msn.c:548
-#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
-msgid "Status"
-msgstr "Estado"
-
-#: ../src/gtksavedstatuses.c:1072
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1123
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunhas contas"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1187
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Ga_rdar e usar"
 
-#: ../src/gtksavedstatuses.c:1393
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#: ../src/gtksound.c:59
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Conéctase un amigo"
 
-#: ../src/gtksound.c:60
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Desconéctase un amigo"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Recíbese unha mensaxe"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Recíbese unha mensaxe que comeza unha conversación "
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Envíase unha mensaxe "
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Alguén entra ao chat"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Alguén deixa o chat"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Fala no chat"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Outros falan no chat"
 
-#: ../src/gtksound.c:70
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Alguén menciona o seu nome no chat"
 
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Fallou GStreamer"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer fallou ao inicializar."
+
 #. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:977 ../src/protocols/msn/session.c:344
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
-#: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../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 "Conectando"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alcume"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Pechar _solapas"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Obter información"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Invitar"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Modificar"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "A_brir correo"
-
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:545
+msgid "Waiting for network connection"
+msgstr "Agardando pola conexión de rede"
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu cargando %s: %s"
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "Fallou ao cargar a imaxe"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Non se pode enviar o cartafol %s."
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1412
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
@@ -5295,11 +4217,11 @@
 "Gaim non pode transferir un cartafol. Necesitará enviar os ficheiros "
 "individualmente"
 
-#: ../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 "Arrastrouse unha imaxe"
 
-#: ../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."
@@ -5307,23 +4229,23 @@
 "Pode enviar esta imaxe coma unha transferencia de ficheiro, introducila na "
 "mensaxe, ou usala coma icona de amigo para este usuario."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "Establecer como icona de amigo"
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "Enviar ficheiro de imaxe"
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "Inserir na mensaxe"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Desexa establecela coma a icona de amigo para este usuario?"
 
-#: ../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."
@@ -5331,7 +4253,7 @@
 "Pode enviar esta imaxe como unha transferencia de ficheiro, ou introducila "
 "nesta mensaxe, ou usala coma icona de amigo para este usuario."
 
-#: ../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"
@@ -5344,11 +4266,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 "Non se pode enviar o lanzador"
 
-#: ../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."
@@ -5356,39 +4278,1627 @@
 "Arrastrou un lanzado de escritorio. O máis probable é que queira enviar a o "
 "que apunta o lanzador máis que o lanzador en si."
 
-#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+#: ../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>Ficheiro:</b> %s\n"
+"<b>Tamaño do ficheiro:</b> %s\n"
+"<b>Tamaño da imaxe:</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 "Icona de amigo"
+
+#: ../gtk/gtkutils.c:2733
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Fallou ao abrir o ficheiro '%s': %s"
+
+#: ../gtk/gtkutils.c:2782
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Fallou ao cargar a imaxe '%s': razón descoñecida, probablemente un ficheiro de imaxe corrupto"
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "Gardar ficheiro"
 
-#: ../src/gtkwhiteboard.c:863
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "Seleccionar cor"
 
-#: ../src/log.c:180
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "Amosar estatísticas"
+
+#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "Probabilidade de resposta:"
+
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "Configuración das estatísticas"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+msgid "Maximum response timeout:"
+msgstr "Tempo de espera máximo para respostas:"
+
+#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+msgid "minutes"
+msgstr "minutos"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr "Diferencia máxima de \"visto por última vez\":"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "Umbral:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr "Complemento de predición de dispoñibilidade de contactos."
+
+#. *  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 "O complemento de dispoñibilidade de contactos (cap) emprégase para amosar información estatística sobre os amigos na lista de contactos dun usuario."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "O amigo está inactivo"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "O amigo está ausente"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "O amigo está en ausencia \"extendida\""
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "O amigo está móbil"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "O amigo está desconectado"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Valores a usar cando..."
+
+#: ../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 ""
+"O amigo con <i>puntuación alta</i> é o amigo que terá prioridade no "
+"contacto.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Usar o último amigo cando as puntuacións sexan iguais"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Valores a usar para a conta..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Prioridade do contacto"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
+
+#. *< 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 ""
+"Permite cambiar os puntos asignados aos estados inactivo/ausente/"
+"desconectado para os amigos en cálculos de prioridades de contacto."
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Por número de conversacións"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Localización da conversación"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Número de conversacións por fiestra"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separar fiestras de MIs e chats cando se ubican por número"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "_UbicaciónExt"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Opcións adicionais de ubicación de conversacións."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Restrinxir o número de conversación por fiestra, de forma optativa utilizar "
+"fiestras distintas para MIs e chats"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Complemento de demostración de Gaim"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Un exemplo de complemento que fai cousas - consulte a descrición."
+
+#. *  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 ""
+"Este é un complemento moi interesante que foi moitas cousas:\n"
+"- Dille quén escribiu o programa cando inicia a sesión\n"
+"- Transpón o texto que lle envían\n"
+"- Envía unha mensaxe ás persoas na súa lista inmediatamente cando se conectan"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Cor do cursor"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Cor secundario do cursor"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Cor de ligazón"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Tamaño do expansor GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Separación horizontal de GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Entrada de conversacións"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Historial de conversacións"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Visor de rexistro"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Diálogo de solicitude"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Diálogo de notificación"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Sangría do expansor GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Seleccionar a cor para %s"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Seleccionar cor"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Seleccionar fonte para %s"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Seleccionar fonte de instancia"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "Xeral"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "Fonte da interface GTK+"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "Tema de atallo de texto GTK+"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Cores da interface"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Tamaños do widget"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Fontes"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Ferramentas"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Escribir axustes en %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Reler ficheiros gtkrc"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Control de tema GTK+ de gaim"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Provee acceso as opcións de gtkrc usadas comunmente."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Configuración dos xestos co rato"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Botón central do rato"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Botón dereito do rato"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "Mostrar xestos _visuais"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Xestos co rato"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Proporciona soporte para xestos co rato"
+
+#. *  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 ""
+"Permite soporte de xesto do rato nas fiestras de conversación.\n"
+"Arrastre co botón central do rato para realizar as seguintes accións:\n"
+"\n"
+"Abaixo e despois á dereita para pechar unha fiestra de conversación.\n"
+"Arriba e despois á esquerda para cambiar á conversación anterior.\n"
+"Arriba e despois á dereita para cambiar á seguinte conversación."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Mensaxería instantánea"
+
+#. 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 ""
+"Seleccione unha persoa da súa axenda mostrada abaixo, ou engada unha nova "
+"persoa."
+
+#. "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:6086 ../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 "Buscar"
+
+#. "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 "Nova persoa"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Seleccionar amigo"
+
+#. 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 ""
+"Seleccione unha persoa da súa axenda á que engadir este amigo, cree unha "
+"nova persoa."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "_Detalles de usuario"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "_Asociar amigo"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1145
+msgid "None"
+msgstr "Ningún"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "Unable to send e-mail"
+msgstr "Imposible enviar correo-e"
+
+#: ../gtk/plugins/gevolution/gevolution.c:264
+msgid "The evolution executable was not found in the PATH."
+msgstr "O executable de evolution non se atopou na RUTA."
+
+#: ../gtk/plugins/gevolution/gevolution.c:270
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "O amigo especificado non se atopou nos contactos de Evolution."
+
+#: ../gtk/plugins/gevolution/gevolution.c:287
+msgid "Add to Address Book"
+msgstr "Engadir á axenda"
+
+#: ../gtk/plugins/gevolution/gevolution.c:291
+msgid "Send E-Mail"
+msgstr "Enviar correo electrónico"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:418
+msgid "Evolution Integration Configuration"
+msgstr "Configuración da integración con Evolution"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:421
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma automática"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:528
+msgid "Evolution Integration"
+msgstr "Integración con Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:531
+#: ../gtk/plugins/gevolution/gevolution.c:533
+msgid "Provides integration with Evolution."
+msgstr "Ofrece integración con Evolution."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Introduza a información da persoa a continuación."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta máis abaixo."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Tipo de conta:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Información opcional:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Nome:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Apelidos:"
+
+#: ../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 "Proba de sinais GTK"
+
+#. *< 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 ""
+"Probar para ver se todos os sinais da interface de usuario funcionan "
+"correctamente."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "Historial"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Iconizar en ausencia"
+
+#. *< 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 "Iconiza a lista de amigos e de conversacións cando vostede está ausente."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Comprobador de correo"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Comproba se hai correo local novo."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Engade unha pequena caixa á lista de amigos que mostra se ten novo correo."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Solicitouse unha sesión de mensaxería musical. Seleccione a icona de MM para "
+"aceptala."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Confirmouse a sesión de mensaxería musical."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "Mensaxería musical"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Produciuse un conflicto ao executar a orde:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Erro executando o Editor"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "Ocorreu o seguinte erro:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "Configuración de mensaxes de música"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Ruta do editor de partituras"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Complemento de mensaxería musical para composición colaborativa."
+
+#. *  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 ""
+"O complemento de mensaxería musical permite traballar a distintos usuarios "
+"de forma simultánea nunha peza de música editando unha partitura común en "
+"tempo real."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Notificar de"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "Fiestras de M_I"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "Fiestras de C_hat"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Só se alguén nomea o seu alcume"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "Fiestras en_focadas"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "Métodos de notificación"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Prefixar a _cadea no título da fiestra:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Inserir o _número de mensaxes novos no título da fiestra"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "Inserir o número de mensaxes novas na propiedade _X"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Establecer pista \"_URXENTE\" do xestor de fiestras"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "S_ubir a fiestra de conversación"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Eliminación da notificación"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Eliminar cando a fiestra da conversación obtén o _foco"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Eliminar cando a fiestra da conversación _recibe unha pulsación"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Eliminar cando se _escriba na fiestra da conversación"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Eliminar cando se envíe unha _mensaxe"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Eliminar ao cambiar de _solapa de conversación"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Notificación de mensaxes"
+
+#. *< 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 "Permite notificar de diversas formas a presencia de mensaxes sen ler."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "En bruto"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Permítelle enviar datos en bruto a protocolos basados en texto."
+
+#: ../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 ""
+"Permítelle enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
+"IRC, TOC). Prema 'Intro' na caixa de entrada para envialo. Observe a fiestra "
+"de depuración."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Está usando a versión de Gaim %s.  A versión actual é %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Rexistro de cambios:</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 ""
+"Pode obter a versión %s de:<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 "Nova versión dispoñible"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Notificación de versións"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Comproba periodicamente a existencia de novas versións."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Comproba periodicamente se hai novas versións dispoñibles e notifica ao "
+"usuario mostrándolle o rexistro de cambios."
+
+#: ../gtk/plugins/spellchk.c:1963
+msgid "Duplicate Correction"
+msgstr "Corrección duplicada"
+
+#: ../gtk/plugins/spellchk.c:1964
+msgid "The specified word already exists in the correction list."
+msgstr "A palabra especificada xa existe na lista de corrección."
+
+#: ../gtk/plugins/spellchk.c:2172
+msgid "Text Replacements"
+msgstr "Remprazos de texto"
+
+#: ../gtk/plugins/spellchk.c:2195
+msgid "You type"
+msgstr "Vostede escribe"
+
+#: ../gtk/plugins/spellchk.c:2209
+msgid "You send"
+msgstr "Vostede envía"
+
+#: ../gtk/plugins/spellchk.c:2223
+msgid "Whole words only"
+msgstr "Soamente palabras enteiras"
+
+#: ../gtk/plugins/spellchk.c:2235
+msgid "Case sensitive"
+msgstr "Sensible ás maiúsculas"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "Add a new text replacement"
+msgstr "Engadir unha nova regra de remprazo de texto"
+
+#: ../gtk/plugins/spellchk.c:2277
+msgid "You _type:"
+msgstr "Vostede _escribe:"
+
+#: ../gtk/plugins/spellchk.c:2294
+msgid "You _send:"
+msgstr "Vostede _envía:"
+
+#. 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 ""
+"Axustar ao formato _exacto (desmarcar para xestionar maiúsculas e minúsculas "
+"automaticamente)"
+
+#: ../gtk/plugins/spellchk.c:2308
+msgid "Only replace _whole words"
+msgstr "Reemprazar soamente palabras _enteiras"
+
+#: ../gtk/plugins/spellchk.c:2333
+msgid "General Text Replacement Options"
+msgstr "Opcións de reemprazos de texto xeral"
+
+#: ../gtk/plugins/spellchk.c:2334
+msgid "Enable replacement of last word on send"
+msgstr "Activar a sustitución da última palabra ao enviar"
+
+#: ../gtk/plugins/spellchk.c:2359
+msgid "Text replacement"
+msgstr "Remprazo de texto"
+
+#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Rempraza o texto das mensaxes saíntes según as regras definidas polo usuario."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Deslizante de amigos"
+
+#. *< 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 "Unha versión horizontal deslizante da lista de amigos."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "Selo temporal ao estilo iChat"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Retardo"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minutos."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Marca temporal"
+
+#. *< 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 "Engade unha marca de tempo ao estilo iChat nas conversacións cada N minutos."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Opcións de formato da marca temporal"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forzar formato de tempo de 24 horas (Gaim tradicional)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Amosar datas en..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversacións:"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Para mensaxes diferidas"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Para mensaxes diferidas e para chats"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Rexistro de _mensaxes:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Formatos de marca de tempo de mensaxes"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Personaliza o formato da marca de tempo de mensaxes."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Este complemento permite ao usuario personalizar os formatos de marca de "
+"tempo para as mensaxes de conversacións e mensaxes de rexistro."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Opacidade:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Fiestras de conversación de MI"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "Transparencia das fiestras de M_I"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "A_mosar barra deslizante na fiestra MI"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Eliminar a transparencia das fiestra MI ao enfocar"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Sempre enriba"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Fiestra da lista de amigos"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Transparencia da fiestra de lista de _amigos"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Eliminar transparencia da fiestra da lista de amigos ao obter o foco"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparencia"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Transparencia variable para a lista de amigos e as conversacións."
+
+#. *  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 ""
+"Este complemento activa transparencias alfa nas fiestras de conversación e "
+"na lista de amigos.\n"
+"\n"
+"* Nota: Este complemento require Win2000 ou outro máis novo."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "Versión en execución de GTK+"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "Inicio"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "_Iniciar Gaim ao iniciar Windows"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "Lista de amigos a_pilable"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "_Manter a fiestra de amigos por enriba:"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "Só cando está empotrado"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "_Destello de fiestra cando se reciben mensaxes de chat"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "Opcións WinGaim"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Opcións específicas de Gaim para Windows."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+#, fuzzy
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr ""
+"Contén as opcións específicas para o Gaim de Windows, como o apilado da "
+"lista de amigos ou o palpabrexo de conversacións."
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "contas"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "O contrasinal é necesario para iniciar sesión."
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Introduza o contrasinal para %s (%s)"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "Introducir contrasinal"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "Gardar contrasinal"
+
+#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Falta o complemento de protocolo para %s"
+
+#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1295
+msgid "New passwords do not match."
+msgstr "Os novos contrasinais non coinciden."
+
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "Encha todos os campos completamente."
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "Contrasinal orixinal"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "Novo contrasinal"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "Novo contrasinal (outra vez)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "Cambiar o contrasinal de %s"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "Introduza seu contrasinal actual e o contrasinal novo."
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "Cambiar a información do usuario %s"
+
+#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Establecer súa información de usuario"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "lista de amigos"
+
+#: ../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 amigo do grupo %s non se eliminou porque a súa conta non estaba "
+"conectada. Este amigo e os seus grupos non foron eliminados.\n"
+msgstr[1] ""
+"%d amigos do grupo %s non se eliminou porque a súa conta non estaba "
+"conectada. Este amigo e os seus grupos non foron eliminados.\n"
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "Grupo non eliminado"
+
+#: ../libgaim/connection.c:106
+msgid "Registration Error"
+msgstr "Erro de rexistro"
+
+#: ../libgaim/connection.c:292
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s conectouse"
+
+#: ../libgaim/connection.c:325
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s desconectouse"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Non se puido enviar a mensaxe. É demasiado longa."
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Non se puido enviar a mensaxe a %s."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "A mensaxe é demasiado longa."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Non se puido enviar a mensaxe."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Enviar mensaxe"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "En_viar mensaxe"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s entrou na sala."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] entrou na sala."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Agora se chama %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s agora se chama %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s saíu da sala."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s saíu da sala (%s)."
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Sen nome"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Fallou ao obter a conexión: %s"
+
+#: ../libgaim/dbus-server.c:585
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Fallou ao obter o nome: %s"
+
+#: ../libgaim/dbus-server.c:598
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Fallou ao obter o nome do servidor: %s"
+
+#: ../libgaim/dnsquery.c:490
+#, fuzzy
+msgid "Unable to create new resolver process\n"
+msgstr "Non se puido crear o socket"
+
+#: ../libgaim/dnsquery.c:495
+msgid "Unable to send request to resolver process\n"
+msgstr "Non se puido enviar unha solicitude ao proceso de resolución\n"
+
+#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Erro ao resolver %s:\n"
+"%s."
+
+#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Erro resolvendo %s: %d"
+
+#: ../libgaim/dnsquery.c:553
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Erro lendo do proceso de resolución:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr "Fin de ficheiro mentras se lía do proceso de resolución"
+
+#: ../libgaim/dnsquery.c:734
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Fallo da creación do fío: %s"
+
+#: ../libgaim/dnsquery.c:735
+msgid "Unknown reason"
+msgstr "Razón descoñecida"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Erro lendo %s:\n"
+"%s.\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Erro escribindo %s:\n"
+"%s.\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Erro accedendo a %s:\n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "Non se pode enviar un ficheiro de 0 bytes."
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "Non se pode enviar un directorio."
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s non é un ficheiro regular. Non se sobrescribirá.\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s quere enviarlle %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s quere enviarlle un ficheiro"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Aceptar solicitude de transferencia de ficheiro de %s?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Hai un ficheiro dispoñible a descargar desde:\n"
+"Servidor remoto: %s\n"
+"Porto remoto: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "Ofrécese a enviar %s a %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s non é un nome de ficheiro válido.\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Ofrécese a enviar %s a %s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Iniciando transferencia de %s desde %s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Completouse a transferencia de %s"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Transferencia de ficheiros completa"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Cancelou a transferencia de %s"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Transferencia de ficheiros cancelada"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s cancelou a transferencia de %s"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s cancelou a transferencia de ficheiros"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Transferencia de ficheiro a %s fallou."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Transferencia de ficheiro desde %s fallou."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+#: ../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 ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">O rexistro non ten función de lectura</font></b>"
 
-#: ../src/log.c:561
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:572
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: ../src/log.c:583
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Gaim antigo"
 
-#: ../src/log.c:678
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "O rexistro desta conversación fallou."
 
-#: ../src/log.c:1028
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1102
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5397,7 +5907,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1104
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5406,41 +5916,47 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1162 ../src/log.c:1294
+#: ../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>Non se puido atopar a ruta do rexistro!</b></font>"
 
-#: ../src/log.c:1174 ../src/log.c:1308
+#: ../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>Non se puido ler o ficheiro: %s</b></font>"
 
-#: ../src/log.c:1236
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
-#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
-#: ../src/protocols/oscar/oscar.c:2701
+#: ../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:2678
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Non houbo conincidencia no número máxico do complemento %d (necesitaba %d)"
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Non houbo coincidencia no número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "O complemento non implementa todas as funcións necesarias"
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:533
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5449,39 +5965,527 @@
 "Non se atopou o complemento necesario %s. Por favor, instale este "
 "complemento e inténteo de novo."
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Gaim atopou erros cargando o complemento."
 
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Non se puido cargar o complemento necesario %s."
 
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim non puido cargar seu complemento."
 
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Non se puido cargar o complemento dependente %s."
 
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim atopou erros descargando o complemento."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "Exemplo de DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "Exemplo de complemento DBus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Control de ficheiros de Gaim"
+
+#. *< 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 "Permite controlar Gaim introducindo comandos nun ficheiro."
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "Minutos"
+
+#. 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 "Xenerador de ausencia"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Establecer tempo de inactividade da conta"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Establecer"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Ningunha das túas contas están inactivas."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Desestablecer tempo de inactividade da conta"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Desestablecer"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Establecer o tempo de inactividade para todas as contas"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Desactivar o tempo de inactividade para todas as contas inactivas"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Permite alterar canto tempo estivo ausente"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "Cliente de proba IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Complemento de proba con soporte IPC, como un cliente."
+
+#. *  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 ""
+"Complemento de proba con soporte IPC, como un cliente. Este localiza o "
+"complemento de servidor e chama aos comandos rexistrados."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Servidor de proba IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Complemento de soporte IPC de proba, como un servidor."
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Complemento de soporte IPC de proba, como un servidor. Este rexistra os "
+"comandos IPC."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "O usuario está desconectado."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Enviar resposta automática:"
+
+#: ../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 desconectouse."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "Unha ou máis mensaxes pode que non chegaran ao destino."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Foi desconectado do servidor."
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Está actualmente desconectado. As mensaxes non se recibirán a non ser que se "
+"conecte."
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude máxima."
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "A mensaxe non puido ser enviada."
+
+#. 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 "Fogo"
+
+#. 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 "Configuración de lectura de rexistro xeral"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Cálculos de tamaño rápido"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Usar nomes heurísticos"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Directorio de rexistro"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Lector de rexistro"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+#, fuzzy
+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 ""
+"Cando os rexistros sexan vistos, este complemento incluirá rexistros doutros "
+"clientes de MI. Actualmente, isto inclúe a Adim, Fire, Messenger Plus!, MSN "
+"Messenger, e Trillian."
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Cargador de complementos mono"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Carga complementos .NET con Mono."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Cargador de complementos Perl"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Provee soporte para cargar complementos en perl."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Modo psíquico"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Modo psíquico para conversación entrantes"
+
+#: ../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 ""
+"Fai que aparezan as fiestras de conversación cando un usuario empeza a "
+"enviarlle unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e 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 "Sentiches unha perturbación na forza..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Activar só para usuarios da lista de amigos"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Desactivar cando está ausente"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Amosa a mensaxe de notificación nas conversación"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Proba de sinais"
+
+#. *< 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 "Probar para ver se todas as sinais funcionan correctamente."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Complemento sinxelo"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
+
+#. *< 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 "Proporciona un recubrimento a través das bibliotecas de soporte de SSL."
+
+#. *< 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 "Proporciona soporte SSL a través de 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 "Proporciona soporte SSL a través do NSS de Mozilla."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s xa non está ausente."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s marchouse."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s está agora inactivo."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s xa non está inactivo."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s conectouse."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Notificar cando"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "O amigo _auséntase"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "O amigo está _inactivo"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "_Conéctase/Desconectouse un amigo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Notificación de estado de amigos"
+
+#. *< 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 ""
+"Notifica nunha fiestra de conversación cando un amigo auséntase ou volve ou "
+"está inactivo."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Cargador de complementos Tcl"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Provee soporte para cargar complementos Tcl"
+
+#: ../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 ""
+
 #. 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 "Imposible escoitar as conexións de MI entrantes\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 "Imposible establecer a conexión co servidor local mDNS. Estase executando?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3243
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3236
 #, c-format
 msgid ""
 "\n"
@@ -5490,7 +6494,7 @@
 "\n"
 "<b>Estado:</b> %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5509,82 +6513,83 @@
 #. *< 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 "Complemento de protocolo Bonjour"
 
-#: ../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 "Usuario de Gaim"
 
 #. 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 "Nome do servidor"
 
 #. 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:2049 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6470
-#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
-#: ../src/protocols/toc/toc.c:2344
-msgid "Port"
-msgstr "Porto"
-
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:769
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:796
 msgid "First name"
 msgstr "Nome"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:774
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:801
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:759 ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/silc.c:939
+#: ../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"
 
-#: ../src/protocols/bonjour/bonjour.h:35
+#: ../libgaim/protocols/bonjour/bonjour.c:590
+msgid "AIM Account"
+msgstr "Conta AIM"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:593
+msgid "Jabber Account"
+msgstr "Conta Jabber"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s pechou a conversación."
 
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Non se puido abrir o socket"
 
-#: ../src/protocols/bonjour/jabber.c:447
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Erro ao establecer as opcións do socket"
 
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
-msgstr "Non se pode vincular o socket a un porto"
-
-#: ../src/protocols/bonjour/jabber.c:465
-msgid "Cannot listen on socket"
-msgstr "Non se pode escoitar no socket"
-
-#: ../src/protocols/bonjour/jabber.c:559
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "Non se pode vincular o socket ao porto"
+
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Non se puido escoitar no socket"
+
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversación."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1774
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1774
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -5592,304 +6597,315 @@
 "O nome do servidor ou o porto especificados non son válidos para seu tipo de "
 "proxy."
 
-#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erro de token"
 
-#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+#: ../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 "Non se puido obter o token.\n"
 
-#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A túa lista de amigos está baleira, non se escribiu nada no ficheiro."
 
-#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../src/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Lista de amigos gardada correctamente!"
 
-#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Non se puido cargar a lista de amigos"
 
-#: ../src/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de amigos cargada satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:380
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Encher os campos de rexistro."
 
-#: ../src/protocols/gg/gg.c:385
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/gg/gg.c:394
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Non se puido rexistrar a conta nova. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:407
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:408
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Rexistro completado satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1305
+#: ../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 "Contrasinal"
 
-#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Introduza o token actual"
 
-#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar conta nova de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:495
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Por favor, encha os seguintes campos"
 
 #. General
-#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
-#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
-#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
-#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1368
-#: ../src/protocols/msn/msn.c:1530 ../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:1041
+#: ../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 "Alcume"
 
-#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:784
-#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
+#: ../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:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Cidade"
 
-#: ../src/protocols/gg/gg.c:637
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Cumpreanos"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:3651
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../src/protocols/gg/gg.c:641
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3651
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Home"
 
-#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3651
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Muller"
 
-#: ../src/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Só conectado"
 
-#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Procurar amigos"
 
-#: ../src/protocols/gg/gg.c:653
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduza a continuación o seu criterio de busca"
 
-#: ../src/protocols/gg/gg.c:690
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Encher os campos."
 
-#: ../src/protocols/gg/gg.c:702
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Teu contrasinal actual é diferente do primeiro que especificou."
 
-#: ../src/protocols/gg/gg.c:716
-msgid "Unable to change password. Error occured.\n"
+#: ../libgaim/protocols/gg/gg.c:716
+msgid "Unable to change password. Error occurred.\n"
 msgstr "Non se puido cambiar o contrasinal. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:725
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar o contrasinal da conta Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:726
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Cambiouse con éxito o contrasinal!"
 
-#: ../src/protocols/gg/gg.c:759
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../src/protocols/gg/gg.c:784
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o contrasinal novo para UIN:"
 
-#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar o contrasinal Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:863
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para o amigo: %s"
 
-#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Engadir ao chat..."
 
-#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3623
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3620
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
-#: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
+#: ../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:3631
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "Data de nacemento"
 
-#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3798
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3795
 msgid "Unable to display the search results."
 msgstr "Non se poden amosar os resultados da busca."
 
-#: ../src/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../src/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1196
 msgid "No matching users found"
 msgstr "Non se atoparon usuarios coincidintes"
 
-#: ../src/protocols/gg/gg.c:1198
+#: ../libgaim/protocols/gg/gg.c:1197
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "Non se puido ler o socket"
 
-#: ../src/protocols/gg/gg.c:1375
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../src/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "A túa lista de amigos foi descargada desde o servidor."
 
-#: ../src/protocols/gg/gg.c:1383
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos subida"
 
-#: ../src/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "A túa lista de amigos foi almacenada no servidor."
 
-#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../src/protocols/gg/gg.c:1638
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Engadir ao chat"
 
-#: ../src/protocols/gg/gg.c:1647
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../src/protocols/gg/gg.c:1651
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../src/protocols/gg/gg.c:1668
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nome do chat:"
 
-#: ../src/protocols/gg/gg.c:1896
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Erro do chat"
 
-#: ../src/protocols/gg/gg.c:1897
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "O nome deste chat xa está en uso"
 
-#: ../src/protocols/gg/gg.c:1980
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "Non conectado ao servidor."
 
-#: ../src/protocols/gg/gg.c:2003
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Procurar amigos..."
 
-#: ../src/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Trocar contrasinal..."
 
-#: ../src/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Subir lista de amigos ao servidor"
 
-#: ../src/protocols/gg/gg.c:2019
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Descargar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:2023
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Borrar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Gardar lista de amigos ao ficheiro..."
 
-#: ../src/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Cargar lista de amigos desde ficheiro..."
 
@@ -5904,119 +6920,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2127
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2128
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "MI polaca moi popular"
 
-#: ../src/protocols/gg/gg.c:2176
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando descoñecido: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1293
+#: ../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 "o tópico actual é: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1297
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "Non hai un tópico establecido"
 
-#: ../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 "Fallou a transferencia do ficheiro"
 
-#: ../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 non puido abrir un porto de escoita."
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Erro ao mostrar o MOTD"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "Non hai MOTD dispoñible"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "Non hai MOTD asocidado con esta conexión."
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %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 "O servidor desconectouse"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Ver 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 "_Canle:"
 
-#: ../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 "_Contrasinal:"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "Os alcumes de IRC non poden ter espacios en branco"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
-#: ../src/protocols/jabber/jabber.c:888
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
+#: ../libgaim/protocols/jabber/jabber.c:916
 msgid "SSL support unavailable"
 msgstr "Soporte SSL non dispoñible"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1521
+#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "Non se puido crear o socket"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1246
+#: ../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 "Non se puido conectar ao servidor"
 
-#: ../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 "Fallou a conexión"
 
-#: ../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 "Fallou na negociación SSL"
 
-#: ../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 "Erro de lectura"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
-#: ../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 "Usuarios"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
-#: ../src/protocols/silc/chat.c:1424 ../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 "Tópico"
 
@@ -6028,39 +7047,49 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:902
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/msn/msn.c:2044
-#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6467
-#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
-#: ../src/protocols/toc/toc.c:2340
+#: ../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:6532
+#: ../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 "Servidor"
 
-#: ../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:6535 ../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 "Porto"
+
+#: ../libgaim/protocols/irc/irc.c:928
 msgid "Encodings"
 msgstr "Codificacións"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:744 ../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 "Nome de usuario"
 
-#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Nome real"
 
@@ -6068,163 +7097,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 "Usar SSL"
 
-#: ../src/protocols/irc/msgs.c:107
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Modo erróneo"
 
-#: ../src/protocols/irc/msgs.c:118
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Foi vetado desde %s."
 
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Vetado"
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Non se puido vetar a %s: a lista de vetados está chea"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../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:215 ../src/protocols/oscar/oscar.c:3624
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3621
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
-#: ../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:241 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adxetivo que o define:</b> Glorioso<br>"
 
-#: ../src/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s quitou o tópico."
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico de %s é: %s"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaxe descoñecida '%s'"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Mensaxe descoñecida"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim enviou unha mensaxe que o servidor IRC non puido entender."
 
-#: ../src/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../src/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Resposta de hora"
 
-#: ../src/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor de IRC é:"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Non existe ese canle"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "non existe o canle"
 
-#: ../src/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "O usuario non está conectado"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Non existe o alcume ou canle"
 
-#: ../src/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Non se puido enviar"
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s requírese unha invitación."
 
-#: ../src/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Só con invitación"
 
-#: ../src/protocols/irc/msgs.c:718
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:723 ../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 "Expulsado por %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:746
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Alcume inválido"
 
-#: ../src/protocols/irc/msgs.c:833
+#: ../libgaim/protocols/irc/msgs.c:841
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6232,7 +7261,7 @@
 "O servidor rexeitou o alcume que escolleu para a súa conta. É posible que "
 "inclúa caracteres inválidos."
 
-#: ../src/protocols/irc/msgs.c:837
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6240,51 +7269,51 @@
 "O servidor rexeitou o nome que escolleu para a súa conta. É posible que "
 "inclúa caracteres inválidos."
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr "Non se puido cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:897
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Abadonou o canle %s%s"
 
-#: ../src/protocols/irc/msgs.c:939
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../src/protocols/irc/msgs.c:941
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Reposta PING -- Retraso: %lu segundos"
 
-#: ../src/protocols/irc/msgs.c:1022
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Non se pode unir a %s:"
 
-#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Non se pode unir ao canle"
 
-#: ../src/protocols/irc/msgs.c:1057
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
 msgstr "O alcume ou canle non están temporalmente dispoñibles."
 
-#: ../src/protocols/irc/msgs.c:1069
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensaxes globais de %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;acción a realizar&gt;:  Realiza unha acción."
 
-#: ../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."
@@ -6292,11 +7321,11 @@
 "away [mensaxe]:  Establece a mensaxe cando está ausente, ou non empregar "
 "unha mensaxe ao deixar de estar ausente."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Enviar un comando a 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."
@@ -6304,7 +7333,7 @@
 "deop &lt;alcume1&gt; [alcume2] ...:  Quitarlle a alguén o estado de operador "
 "de canle. Só un operador de canle pode facer iso."
 
-#: ../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 "
@@ -6314,7 +7343,7 @@
 "falar no canle se este está moderado (+m). Só o pode facer un operador de "
 "canle."
 
-#: ../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."
@@ -6322,7 +7351,7 @@
 "invite &lt;alcume&gt; [sala]:  Invita a alguén a unirse ao canle "
 "especificado ou ao canle actual."
 
-#: ../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."
@@ -6330,7 +7359,7 @@
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nun ou máis "
 "canles empregando, opcionalmente, unha clave de canle se fora necesario."
 
-#: ../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."
@@ -6338,7 +7367,7 @@
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nun ou "
 "máis canles empregando, opcionalmente, unha clave de canle se fora necesario."
 
-#: ../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."
@@ -6346,7 +7375,7 @@
 "kick &lt;alcume&gt; [mensaxe]:  Botar a alguén do canle. Só o poden facer os "
 "operadores de canle."
 
-#: ../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>"
@@ -6354,15 +7383,15 @@
 "list:  Amosa unha lista das salas de chat dispoñibles na rede. <i>Aviso: "
 "algúns servidores pode que lle desconecten se fai isto.</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;acción a realizar&gt;:  Realizar unha acción."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Enviar un comando ao 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."
@@ -6370,7 +7399,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;alcume|canle&gt;:  Establece ou elimina "
 "un modo de canle ou de usuario."
 
-#: ../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)."
@@ -6378,19 +7407,20 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Enviar unha mensaxe privada a un usuario "
 "(o oposto a un canle)."
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que están no canle."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1741
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1766
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Enviar un comando ao 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."
@@ -6398,7 +7428,7 @@
 "op &lt;alcume1&gt; [alcume2] ...:  Dar estado de operador de canle a outra "
 "persoa. Só o pode facer un operador de canle."
 
-#: ../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."
@@ -6406,11 +7436,11 @@
 "operwall &lt;mensaxe&gt;:  Se non sabe o que é probablemente non pode "
 "utilizalo."
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Enviar un comando ao 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."
@@ -6418,7 +7448,7 @@
 "part [sala] [mensaxe]:  Abandonar o canle actual, ou un canle específico, "
 "cunha mensaxe opcional."
 
-#: ../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."
@@ -6426,7 +7456,7 @@
 "ping [alcume]:  Pregunta canta latencia ten un usuario (ou o servidor se non "
 "se especifica un usuario)."
 
-#: ../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)."
@@ -6434,17 +7464,17 @@
 "query &lt;alcume&gt; &lt;mensaxe&gt;:  Envía unha mensaxe privada a un "
 "usuario (o oposto a un canle)."
 
-#: ../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 [mensaxe]:  Desconecta do servidor actual indicando unha mensaxe "
 "(opcional)."
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crú ao servidor."
 
-#: ../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."
@@ -6452,19 +7482,23 @@
 "remove &lt;alcume&gt; [mensaxe]:  Eliminar a alguén dunha sala. Só pode "
 "facelo un operador de canle."
 
-#: ../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: Amosa a hora local no servidor IRC."
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [novo tópico]:  Ver ou trocar o tópico do canle."
 
-#: ../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;:  Establece ou elimina un modo de usuario."
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+#: ../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."
@@ -6472,63 +7506,59 @@
 "voice &lt;alcume1&gt; [alcume2] ...:  Dar a posibilidade de falar no canle a "
 "alguén. Só o pode facer un operador de canle."
 
-#: ../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."
 msgstr "wallops &lt;mensaxe&gt;:  Se non sabe o que é probablemente non poida usalo."
 
-#: ../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;:  Obtén información dun usuario."
 
-#: ../src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../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 "Resposta a PING CTCP"
 
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../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 "Desconectado."
 
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"O servidor require SSL para conectarlle. Seleccione a opción \"Usar TLS se "
-"está dispoñible\" nas propiedades da conta"
-
-#: ../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 "O servidor require SSL para conectarlle. Non se dispón de soporte TLS/SSL."
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "O servidor solicita autenticación en claro sobre un canle non cifrado"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "O servidor non puido autenticarlle sen un contrasinal"
 
-#: ../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 "Autenticación en claro"
 
-#: ../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?"
@@ -6536,104 +7566,126 @@
 "O servidor solicita autenticación en claro sobre un canle non cifrado. "
 "Permitir isto e continuar co proceso de autenticación?"
 
-#: ../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 "O servidor non usa un método de autenticación coñecido"
 
 #. 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 "Resposta inválida do servidor."
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido do servidor"
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
-#: ../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 "Nome completo"
 
-#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
-#: ../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 "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:804
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:831
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Rúa"
 
-#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Enderezo extendido"
 
-#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "Rexión"
 
-#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
-#: ../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 "País"
 
-#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
-#: ../src/protocols/jabber/buddy.c:876
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
-#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
-#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../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 "Correo electrónico"
 
-#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Nome da organización"
 
-#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
-#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Rol"
 
-#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3664
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
-#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: ../src/protocols/jabber/buddy.c:590
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6641,640 +7693,678 @@
 "Todos os elementos seguintes son opcionais. Introduza só a información coa "
 "que se senta cómodo."
 
-#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1906
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../src/protocols/jabber/buddy.c:793 ../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 "Prioridade"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Cliente"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome medio"
 
-#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:779
-#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:806
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../src/protocols/jabber/buddy.c:833
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../src/protocols/jabber/buddy.c:1304
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "Non agocharse de"
 
-#: ../src/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Agocharse temporalmente de"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1316
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../src/protocols/jabber/buddy.c:1323
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1332
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "De-subscribir"
 
-#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1163
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Erro"
-
-#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1188
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1213
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1218
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5623
-#: ../src/protocols/sametime/sametime.c:3277
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/sametime/sametime.c:3270
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
-#: ../src/protocols/jabber/buddy.c:1516
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
-#: ../src/protocols/oscar/oscar.c:3635
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3632
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:1552
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "O seguinte son os resultados da súa busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1627
+#: ../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 ""
 
-#: ../src/protocols/jabber/buddy.c:1647
-#, fuzzy
+#: ../libgaim/protocols/jabber/buddy.c:1651
 msgid "Directory Query Failed"
-msgstr "Fallou a conexión directa"
-
-#: ../src/protocols/jabber/buddy.c:1648
-#, fuzzy
+msgstr "Fallou a consulta ao directorio"
+
+#: ../libgaim/protocols/jabber/buddy.c:1652
 msgid "Could not query the directory server."
-msgstr "Non se puido comezar a transferencia de ficheiros."
+msgstr "Non se puido consultar co servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1682
+#: ../libgaim/protocols/jabber/buddy.c:1686
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruccións do servidor: %s"
 
-#: ../src/protocols/jabber/buddy.c:1689
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Enche un ou máis dos campos amosados a continuación para procurar a un "
 "usuario Jabber que os teña."
 
-#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3634
+#: ../libgaim/protocols/oscar/oscar.c:3641
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Procurar usuarios de Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1733
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../src/protocols/jabber/buddy.c:1750
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Introducir un directorio de usuario"
 
-#: ../src/protocols/jabber/buddy.c:1751
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Seleccione un directorio de usuario para procurar"
 
-#: ../src/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5108
-#: ../src/protocols/yahoo/yahoochat.c:998
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5138
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s non é un nome de sala válido"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nome de sala inválido"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s non é un nome de servidor válido"
 
-#: ../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 "Nome de servidor non válido"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s non é un indicador de sala válido"
 
-#: ../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 "Indicador de sala inválido"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Erro de configuración"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Non se puido configurar"
 
-#: ../src/protocols/jabber/chat.c:419
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Erro de configuración de sala"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Esta sala non é capaz de ser configurada"
 
-#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Erro de rexistro"
 
-#: ../src/protocols/jabber/chat.c:626
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "O cambio de alcume non está soportado en salas de chat non-MUC"
 
-#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
-#: ../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 "Erro ao obter a lista de salas"
 
-#: ../src/protocols/jabber/chat.c:735
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Servidor inválido"
 
-#: ../src/protocols/jabber/chat.c:773
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Introduza un servidor de conferencias"
 
-#: ../src/protocols/jabber/chat.c:774
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Seleccione un servidor de conferencias ao que consultar"
 
-#: ../src/protocols/jabber/chat.c:777
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Erro ao inicializar a sesión"
 
-#: ../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 "Erro de escritura"
 
-#: ../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 "Erro de lectura"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:898
+#: ../libgaim/protocols/jabber/jabber.c:493
+#: ../libgaim/protocols/jabber/jabber.c:924
 msgid "Unable to create socket"
 msgstr "Non se puido crear o socket"
 
-#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
+#: ../libgaim/protocols/jabber/jabber.c:541
+#: ../libgaim/protocols/jabber/jabber.c:884
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../src/protocols/jabber/jabber.c:589
+#: ../libgaim/protocols/jabber/jabber.c:612
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s con éxito"
 
-#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
+#: ../libgaim/protocols/jabber/jabber.c:614
+#: ../libgaim/protocols/jabber/jabber.c:615
 msgid "Registration Successful"
 msgstr "Éxito no rexistro"
 
-#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1454
+#: ../libgaim/protocols/jabber/jabber.c:621
+#: ../libgaim/protocols/jabber/jabber.c:1479
 msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
-#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
+#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libgaim/protocols/jabber/jabber.c:624
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
+#: ../libgaim/protocols/jabber/jabber.c:739
+#: ../libgaim/protocols/jabber/jabber.c:740
 msgid "Already Registered"
 msgstr "Xa está rexistrado"
 
-#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:3688
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../libgaim/protocols/jabber/jabber.c:816
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "State"
 msgstr "Estado"
 
-#: ../src/protocols/jabber/jabber.c:794
+#: ../libgaim/protocols/jabber/jabber.c:821
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
+#: ../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 "Teléfono"
 
-#: ../src/protocols/jabber/jabber.c:809
+#: ../libgaim/protocols/jabber/jabber.c:836
 msgid "Date"
 msgstr "Data"
 
-#: ../src/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/jabber/jabber.c:844
 msgid "Please fill out the information below to register your new account."
 msgstr "Por favor, encha a información abaixo indicada para rexistrar súa nova conta."
 
-#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Register New Jabber Account"
 msgstr "Rexistrando conta nova de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:981
+#: ../libgaim/protocols/jabber/jabber.c:1004
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:987 ../src/protocols/msn/session.c:350
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../src/protocols/jabber/jabber.c:996
+#: ../libgaim/protocols/jabber/jabber.c:1018
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1067 ../src/protocols/jabber/jabber.c:1432
-#: ../src/protocols/jabber/jabber.c:1473 ../src/protocols/jabber/jabber.c:1507
-#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5414
+#: ../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:5444
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../src/protocols/jabber/jabber.c:1109
+#: ../libgaim/protocols/jabber/jabber.c:1134
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../libgaim/protocols/jabber/jabber.c:1136
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1116
+#: ../libgaim/protocols/jabber/jabber.c:1141
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../libgaim/protocols/jabber/jabber.c:1147
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../src/protocols/jabber/jabber.c:1179 ../src/protocols/jabber/jabber.c:1189
-#: ../src/protocols/jabber/jabber.c:1199 ../src/protocols/jabber/jabber.c:1209
-#: ../src/protocols/jabber/jabber.c:1219
-msgid "Priority"
-msgstr "Prioridade"
-
-#: ../src/protocols/jabber/jabber.c:1248
+#: ../libgaim/protocols/jabber/jabber.c:1273
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../libgaim/protocols/jabber/jabber.c:1274
 msgid "Your password has been changed."
 msgstr "Seu contrasinal foi modificado."
 
-#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1278
+#: ../libgaim/protocols/jabber/jabber.c:1279
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1310
+#: ../libgaim/protocols/jabber/jabber.c:1335
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../src/protocols/jabber/jabber.c:1315 ../src/protocols/jabber/jabber.c:1316
+#: ../libgaim/protocols/jabber/jabber.c:1340
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1316
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Please enter your new password"
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1326 ../src/protocols/oscar/oscar.c:6184
-#: ../src/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/oscar/oscar.c:6246
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Establecer súa información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6195
-#: ../src/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1356
+#: ../libgaim/protocols/oscar/oscar.c:6257
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Trocar contrasinal..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1336
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Search for Users..."
 msgstr "Procurar usuarios..."
 
-#: ../src/protocols/jabber/jabber.c:1412
+#: ../libgaim/protocols/jabber/jabber.c:1437
 msgid "Bad Request"
 msgstr "Solicitude errónea"
 
-#: ../src/protocols/jabber/jabber.c:1414
+#: ../libgaim/protocols/jabber/jabber.c:1439
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../libgaim/protocols/jabber/jabber.c:1441
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../libgaim/protocols/jabber/jabber.c:1443
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../libgaim/protocols/jabber/jabber.c:1445
 msgid "Gone"
 msgstr "Foise"
 
-#: ../src/protocols/jabber/jabber.c:1422 ../src/protocols/jabber/jabber.c:1497
+#: ../libgaim/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../src/protocols/jabber/jabber.c:1424
+#: ../libgaim/protocols/jabber/jabber.c:1449
 msgid "Item Not Found"
 msgstr "Elemento non atopado"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../libgaim/protocols/jabber/jabber.c:1451
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../libgaim/protocols/jabber/jabber.c:1453
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../libgaim/protocols/jabber/jabber.c:1455
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../src/protocols/jabber/jabber.c:1434
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1440
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Registration Required"
 msgstr "Rexistro necesario"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Remote Server Timeout"
 msgstr "Expirou o tempo do servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Service Unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Subscription Required"
 msgstr "Subscrición necesaria"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Unexpected Request"
 msgstr "Solicitude non esperada"
 
-#: ../src/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta na autorización"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../src/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1492
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../src/protocols/jabber/jabber.c:1470
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../src/protocols/jabber/jabber.c:1475
+#: ../libgaim/protocols/jabber/jabber.c:1500
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:1503
 msgid "Authentication Failure"
 msgstr "Fallo de autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1482
+#: ../libgaim/protocols/jabber/jabber.c:1507
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espacio de nomes erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1487
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1489 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "Expirou a conexión"
 
-#: ../src/protocols/jabber/jabber.c:1491
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Host Unknown"
 msgstr "Servidor descoñecido"
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../libgaim/protocols/jabber/jabber.c:1520
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../src/protocols/jabber/jabber.c:1499
+#: ../libgaim/protocols/jabber/jabber.c:1524
 msgid "Invalid ID"
 msgstr "ID non válido"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1526
 msgid "Invalid Namespace"
 msgstr "Espacio de nomes non válido"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../libgaim/protocols/jabber/jabber.c:1528
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../libgaim/protocols/jabber/jabber.c:1530
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidintes"
 
-#: ../src/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Policy Violation"
 msgstr "Violación da política"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../libgaim/protocols/jabber/jabber.c:1536
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Undefined Condition"
 msgstr "Condición non definida"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Unsupported Encoding"
 msgstr "Codificación non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Stanza non soportado"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Unsupported Version"
 msgstr "Versión non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../libgaim/protocols/jabber/jabber.c:1554
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1598
+#: ../libgaim/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vetar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1618
+#: ../libgaim/protocols/jabber/jabber.c:1643
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1648
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar ao usuario %s coma \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1642
+#: ../libgaim/protocols/jabber/jabber.c:1667
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol descoñecido: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1649
+#: ../libgaim/protocols/jabber/jabber.c:1674
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Non se puido establecer o rol \"%s\" para o usuario: %s"
 
-#: ../src/protocols/jabber/jabber.c:1702
+#: ../libgaim/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1733
+#: ../libgaim/protocols/jabber/jabber.c:1758
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1737
+#: ../libgaim/protocols/jabber/jabber.c:1762
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1746
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../src/protocols/jabber/jabber.c:1751
+#: ../libgaim/protocols/jabber/jabber.c:1776
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1757
+#: ../libgaim/protocols/jabber/jabber.c:1782
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou cambiar o tópico."
 
-#: ../src/protocols/jabber/jabber.c:1763
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Vetar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1769
+#: ../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."
@@ -7282,7 +8372,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliación dun usuario á sala."
 
-#: ../src/protocols/jabber/jabber.c:1775
+#: ../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."
@@ -7290,19 +8380,19 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o rol dun usuario na sala."
 
-#: ../src/protocols/jabber/jabber.c:1781
+#: ../libgaim/protocols/jabber/jabber.c:1806
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]:  Invitar un usuario á sala."
 
-#: ../src/protocols/jabber/jabber.c:1787
+#: ../libgaim/protocols/jabber/jabber.c:1812
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
 
-#: ../src/protocols/jabber/jabber.c:1793
+#: ../libgaim/protocols/jabber/jabber.c:1818
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1798
+#: ../libgaim/protocols/jabber/jabber.c:1823
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe en privado a un "
@@ -7318,93 +8408,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1881 ../src/protocols/jabber/jabber.c:1883
+#: ../libgaim/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1941
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1909
-msgid "Use TLS if available"
-msgstr "Usar TLS se está dispoñible"
-
-#: ../src/protocols/jabber/jabber.c:1914
-msgid "Require TLS"
-msgstr "Require TLS"
-
-#: ../src/protocols/jabber/jabber.c:1917
+#: ../libgaim/protocols/jabber/jabber.c:1967
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1922
+#: ../libgaim/protocols/jabber/jabber.c:1972
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canles non cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1927 ../src/protocols/simple/simple.c:1775
+#: ../libgaim/protocols/jabber/jabber.c:1977
+#: ../libgaim/protocols/simple/simple.c:1841
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1931 ../src/protocols/silc/silc.c:1854
+#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../src/protocols/jabber/message.c:117
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../src/protocols/jabber/message.c:181
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/jabber/message.c:183
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o envío da mensaxe a %s: %s"
 
-#: ../src/protocols/jabber/message.c:236
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Mensaxe de erro de Jabber"
 
-#: ../src/protocols/jabber/message.c:319
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "Erro de tratamento XML"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Erro descoñecido en presencia"
 
-#: ../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 "O usuario %s quere engadir a %s a súa lista de amigos."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5039
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2358
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5040
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2360
+#: ../libgaim/protocols/oscar/oscar.c:5070
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../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 "Crear unha sala nova"
 
-#: ../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?"
@@ -7412,41 +8500,41 @@
 "Vai crear unha sala nova. Desexa configurala ou aceptar os valores por "
 "omisión?"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no chat %s"
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse ao chat %s"
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
 "ficheiros"
 
-#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Fallou no envío do ficheiro"
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronización da lista de amigos en %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. "
@@ -7455,7 +8543,7 @@
 "%s está na lista local dentro do grupo \"%s\" pero non está na lista do "
 "servidor. Desexa engadir a este amigo?"
 
-#: ../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 "
@@ -7464,263 +8552,266 @@
 "%s está na lista local pero non está na lista do servidor. Desexa engadir a "
 "este amigo?"
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Non se puido interpretar a mensaxe"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Erro de sintase (probablemente un erro de Gaim)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Enderezo de correo electrónico inválido"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "O usuario non existe"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Falta un nome de dominio totalmente cualificado"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Xa está conectado"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Nome de usuario inválido"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Nome de amigo non válido"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista chea"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Xa está na lista"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Non está na lista"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "O usuario está desconectado"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Xa está nese modo"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Xa está na lista contraria"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "O usuario non está no grupo"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Nome de grupo demasiado longo"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Non se pode eliminar o grupo cero"
 
-#: ../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 "Intentou engadir un contacto a un grupo que non existe"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Fallou o servidor Switchboard"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Fallou a notificación da transferencia"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Faltan campos obrigatorios"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados dun FND"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Non iniciou sesión"
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Servizo non dispoñible temporalmente"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Erro do servidor de base de datos"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Comando desactivado"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Erro de operación de ficheiros"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Erro ao asignar memoria"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL erróneo enviado ao servidor"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: ../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 "Servidor non dispoñible"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Servidor de notificación de pares caído"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Erro de conexión coa base de datos"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor está apagándose (abandonen o barco!)"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Erro ao crear a conexión"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Os parámetros CVR non se coñecen ou non están permitidos"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Non se puido escribir"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Sobrecarga de sesión"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "O usuario está demasiado activo"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Demasiadas sesións"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Pasaporte non verificado"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Ficheiro de amigos incorrecto"
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Non se esperaba"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Os nomes de amigos cambian demasiado rápido"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Servidor moi ocupado"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1311
+#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Non pode mandar mensaxes fora de liña"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Non se aceptan usuarios novos"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sen consentemento paterno"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Conta passport non verificada aínda"
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Ticket erróneo"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de erro descoñecido %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Acaba de enviar un cobadazo!"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "O novo nome de amigo MSN é demasiado longo."
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Establecer seu nome de amigo."
 
-#: ../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 "Este é o nome baixo o que outros amigos MSN o verán."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Estableza o número de teléfono de seu domicilio."
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Estableza o número de teléfono de su traballo."
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Estableza seu número de teléfono móvil."
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir envíos de MSN Mobile?"
 
-#: ../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?"
@@ -7728,29 +8819,31 @@
 "Quere permitir ou rexeitar o envío de mensaxes a través de MSN Mobile a seu "
 "teléfono móvil (u outro dispositivo móvil) da xente na súa lista de amigos?"
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Rexeitar"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta de Hotmail quizais non esté activa."
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Enviar unha mensaxe a un móvil."
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Páxina"
 
-#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
-#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
+#: ../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"
@@ -7759,69 +8852,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:555
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Tenlle"
 
-#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
+#: ../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 "Volvo enseguida"
 
-#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
+#: ../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 "Ocupado"
 
-#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
-#: ../src/protocols/yahoo/yahoo.c:3307
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3313
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Saín a xantar"
 
-#: ../src/protocols/msn/msn.c:621
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Establecer nome de amigo..."
 
-#: ../src/protocols/msn/msn.c:626
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Establecer o número de teléfono do seu domicilio..."
 
-#: ../src/protocols/msn/msn.c:630
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Establecer o número de teléfono do seu traballo..."
 
-#: ../src/protocols/msn/msn.c:634
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer o número do teléfono móvil..."
 
-#: ../src/protocols/msn/msn.c:640
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activar/Desactivar dispositivos móviles..."
 
-#: ../src/protocols/msn/msn.c:645
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rexeitar páxinas de móviles..."
 
-#: ../src/protocols/msn/msn.c:655
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Abrir correo de entrada de Hotmail"
 
-#: ../src/protocols/msn/msn.c:679
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Iniciar _Chat"
 
-#: ../src/protocols/msn/msn.c:727
+#: ../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."
@@ -7829,230 +8926,239 @@
 "O soporte SSL é necesario para MSN. Por favor, instale unha biblioteca SSL. "
 "Para máis información, vexa http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:755
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
+#: ../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>Alcume:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1061
+#: ../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:1458
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
-#: ../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 "Erro ao obter o perfil"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3670
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Edade"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
-#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
+#: ../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 "Aficións e intereses"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
-#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
-#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
+#: ../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 "Un pouco sobre min"
 
-#: ../src/protocols/msn/msn.c:1551
+#: ../libgaim/protocols/msn/msn.c:1557
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Xeral</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../src/protocols/msn/msn.c:1561
+#: ../libgaim/protocols/msn/msn.c:1567
 msgid "Interests"
 msgstr "Interés"
 
-#: ../src/protocols/msn/msn.c:1562
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../src/protocols/msn/msn.c:1563
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "Cidade"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr "Lugares nos que viviu"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "Moderno"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "Humor"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "Música"
 
-#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
-#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../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 "Cita preferida"
 
-#: ../src/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Social</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1581
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
 msgstr "Outro significativo"
 
-#: ../src/protocols/msn/msn.c:1582
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../src/protocols/msn/msn.c:1583
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3682
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "Móbil persoal"
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "Correo-e persoal"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1594
 msgid "Personal IM"
 msgstr "MI persoal"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "Notas"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/msn/msn.c:1601
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Persoal</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Traballo"
 
-#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Company"
 msgstr "Compañía"
 
-#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../src/protocols/msn/msn.c:1605
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../src/protocols/msn/msn.c:1606
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "Teléfono do traballo"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3690
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "Móbil do traballo"
 
-#: ../src/protocols/msn/msn.c:1610
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "Paxinador do traballo"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "Fax do traballo"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "Correo-e do traballo"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr "MI do traballo"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1626
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Ocupacións</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1630
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Info de contacto</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
-#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
+#: ../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 "Cousas preferidas"
 
-#: ../src/protocols/msn/msn.c:1754
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../src/protocols/msn/msn.c:1766 ../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 "Páxina persoal"
 
-#: ../src/protocols/msn/msn.c:1791
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../src/protocols/msn/msn.c:1792
+#: ../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 "
@@ -8062,7 +9168,7 @@
 "que ou ben o usuario non existe ou que o usuario existe pero non creou un "
 "perfil público."
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../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."
@@ -8071,12 +9177,13 @@
 "usuario non exista."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1801
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -8090,81 +9197,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../src/protocols/msn/msn.c:2053
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../src/protocols/msn/msn.c:2058
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Amosar emoticóns personalizados"
 
-#: ../src/protocols/msn/msn.c:2066
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
-#: ../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 "Non se puido conectar"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s non é un nome de grupo válido."
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %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 "Non se puido engadir ao usuario a %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 "Non se puido bloquear ao usuario en %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 "Non se puido invitar ao usuario a %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 "Non se puido engadir a %s porque súa lista de amigos está chea."
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s non é un nome de conta passport válida."
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Servizo non dispoñible temporalmente."
 
-#: ../src/protocols/msn/notification.c:820
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Non se puido cambiar o nome do grupo"
 
-#: ../src/protocols/msn/notification.c:875
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Non se puido borrar o grupo"
 
-#: ../src/protocols/msn/notification.c:1308
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8195,15 +9317,15 @@
 "Despois de que se haxan realizado as tarefas de mantemento debería poder "
 "conectarse con éxito de novo."
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Erro de escritura"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Erro de lectura"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8212,292 +9334,226 @@
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:299
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "O servidor non soporta o noso protocolo."
 
-#: ../src/protocols/msn/session.c:303
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Erro no análise HTTP."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3410
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Conectouse desde outra ubicación."
 
-#: ../src/protocols/msn/session.c:310
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Súa lista de amigos MSN non está dispoñible temporalmente. Por favor agarde "
 "e volva a intentalo máis tarde."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN van sufrir un apagado temporal."
 
-#: ../src/protocols/msn/session.c:319
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Non se puido autenticar: %s"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Súa lista de amigos MSN está indispoñible temporalmente. Por favor, espere e "
 "volva a tentalo máis tarde."
 
-#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../src/protocols/msn/session.c:346
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Transfirindo"
 
-#: ../src/protocols/msn/session.c:348
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Comezando a autenticación"
 
-#: ../src/protocols/msn/session.c:349
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Obtendo unha cookie"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Ao teléfono"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Saín a comer"
 
-#: ../src/protocols/msn/switchboard.c:401
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente non se puido enviar a mensaxe porque expirou a conexión:"
 
-#: ../src/protocols/msn/switchboard.c:409
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Non se puido enviar a mensaxe, non está permitido mentras sexa invisible:"
 
-#: ../src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Non se puido enviar a mensaxe porque o usuario non está conectado:"
 
-#: ../src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro na conexión:"
 
-#: ../src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Non se puido enviar a mensaxe porque estamos enviando demasiado rápido:"
 
-#: ../src/protocols/msn/switchboard.c:425
+#: ../libgaim/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
 
-#: ../src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro descoñecido:"
 
-#: ../src/protocols/msn/switchboard.c:953
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"
 
-#: ../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 "O usuario %s (%s) quere engadir a %s a súa lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../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 "O usuario %s engadiuno á súa lista de amigos."
 
-#: ../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 "O usuario %s quitouno da súa lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:667
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:669
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado é inválido."
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Non se puido ler as cabeceiras do servidor"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"Non se puideron ler as mensaxes do servidor: %s.  O comando é %hd, a "
-"lonxitude é %hd."
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Erro de servidor descoñecido."
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "usuarios: %s, ficheiros: %s, tamaño: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "Non se puido engadir \"%s\" a súa lista de amigos Napster"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s solicitou súa información de usuario"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s solicitou un 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:2237 ../src/protocols/yahoo/yahoo.c:2264
-#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
-#: ../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 "Non se puido conectar."
-
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#. *< 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 "Complemento de protocolo NAPSTER"
-
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "Non se recibiron os parámetros requeridos"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "Non se puido escribir na rede"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "NOn se puido ler da rede"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "Erro ao comunicarse co servidor"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "Conferencia non atopada"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "A conferencia non existe"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "Xa existe un cartafol con ese nome"
 
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "Non soportado"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "O contrasinal expirou"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
 msgstr "Contrasinal inválido"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "Usuario non atopado"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "A conta foi deshabilitada"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "O servidor non puido acceder ao directorio"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "Seu administrador do sistema desactivou esta operación"
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "O servidor non está dispoñible, inténteo de novo máis tarde"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Non se pode engadir un contacto ao mesmo cartafol dúas veces"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "Non se pode engadir un mesmo"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "O ficheiro maestro non está ben configurado"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
 msgstr "Nome ou contrasinal de usuario non válido"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr "Non se recoñeceu o servidor do usuario que introduciu"
 
-#: ../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"
@@ -8505,31 +9561,31 @@
 "Súa conta foi deshabilitada porque introduciu demasiadas veces un "
 "contrasinal inválido"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Non pode engadir a mesma persoa dúas veces a unha conversación"
 
-#: ../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 "Alcanzou o límite do número de contactos permitidos"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
 msgstr "O nome de usuario que introduciu non é válido"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "Produciuse un erro ao actualizar o directorio"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "Versión de protocolo incompatible"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "O usuario bloqueouno"
 
-#: ../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"
@@ -8537,54 +9593,55 @@
 "Esta versión de evaluación non permite a conexión simultánea de máis de dez "
 "usuarios"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "O usuario non está conectado ou vostede está sendo bloqueado"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erro descoñecido: 0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallo na conexión (%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 ""
 "Non se puido enviar a mensaxe. Non se puideron obter os detalles do usuario "
 "(%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 "Non se puido engadir %s a súa lista de amigos (%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 "Non se puido enviar a mensaxe (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Non se puido invitar ao usuario (%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 "Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%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 "Non se puido enviar a mensaxe. Non se puido crear a conferencia (%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 "
@@ -8593,7 +9650,7 @@
 "Non se puido mover ao usuario %s ao cartafol %s na lista do servidor. "
 "Produciuse un erro ao crear o cartafol (%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 "
@@ -8602,58 +9659,61 @@
 "Non se puido engadir na súa lista de amigos a %s. Produciuse un erro ao "
 "crear o cartafol na lista do servidor (%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 "Non se puideron obter os detalles do usuario %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 "Non se puido engadir ao usuario a súa lista de privacidade (%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 "Non se puido engadir %s a súa lista de rexeitados (%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 "Non se puido engadir %s a súa lista de permitidos (%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 "Non se puido eliminar %s da súa lista de privacidade (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Non se puideron cambiar as opcións de privacidade do servidor (%s)."
 
-#: ../src/protocols/novell/novell.c:1012
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Non se puido crear a conferencia (%s)."
 
-#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro comunicándose co servidor. Pecharase a conexión."
 
-#: ../src/protocols/novell/novell.c:1476
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Título"
 
-#: ../src/protocols/novell/novell.c:1486
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: ../src/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8664,41 +9724,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1518
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../src/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1667
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Non se puido establecer unha conexión SSL co servidor."
 
-#: ../src/protocols/novell/novell.c:1724
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../src/protocols/novell/novell.c:1736
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/novell/novell.c:1739
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../src/protocols/novell/novell.c:1874
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Invitouse a %s a esta conversación."
 
-#: ../src/protocols/novell/novell.c:1902
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "Invitación a unha conversación"
 
-#: ../src/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8709,15 +9769,16 @@
 "\n"
 "Enviada: %s"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversación?"
 
-#: ../src/protocols/novell/novell.c:2012
+#. 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 "Foi desconectado porque se conectou desde outra estación de traballo."
 
-#: ../src/protocols/novell/novell.c:2068
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
@@ -8728,7 +9789,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2166
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8736,11 +9797,11 @@
 "Non se puido contactar co servidor. Por favor, indique o enderezo do "
 "servidor co que desexa conectarse."
 
-#: ../src/protocols/novell/novell.c:2188
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non está instalado."
 
-#: ../src/protocols/novell/novell.c:2497
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -8754,156 +9815,183 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxería de Grupos Novell"
 
-#: ../src/protocols/novell/novell.c:3562
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#: ../src/protocols/oscar/flap_connection.c:222
+#: ../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 "O servidor pechou a conexión."
 
-#: ../src/protocols/oscar/flap_connection.c:224
-msgid "Lost connection with server for an unknown reason."
-msgstr "Perdeuse a conexión co servidor por unha razón descoñecida."
-
-#: ../src/protocols/oscar/flap_connection.c:226
-#, fuzzy
+#: ../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 ""
+"Perdeuse a conexión co servidor:\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 "Non se puido establecer unha conexión SSL co servidor."
-
-#: ../src/protocols/oscar/flap_connection.c:228
-msgid "Could not establish a connection with the server."
-msgstr "Non se puido establecer unha conexión co servidor."
-
-#: ../src/protocols/oscar/odc.c:41
+msgstr "Recibíronse datos inválidos ao conectarse ao servidor."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Non se puido establecer unha conexión co servidor:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "O usuario remoto pechou a conexión."
 
-#: ../src/protocols/oscar/odc.c:45
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "O usuario remoto rexeitou a túa petición."
 
-#: ../src/protocols/oscar/odc.c:49
-msgid "Lost connection with the remote user for an unknown reason."
-msgstr "Perdeuse a conexión co usuario remoto por unha razón descoñecida."
-
-#: ../src/protocols/oscar/odc.c:53
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Perdeuse a conexión co usuario remoto:<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Recibíronse datos inválidos na conexión co usuario remoto."
 
-#: ../src/protocols/oscar/odc.c:57
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Non se puido establecer a conexión co usuario remoto."
 
-#: ../src/protocols/oscar/odc.c:567
+#: ../libgaim/protocols/oscar/odc.c:561
 msgid "Direct IM established"
 msgstr "MI directo establecido."
 
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Erro inválido"
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Tasa de mensaxes ao servidor"
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Tasa de mensaxes ao cliente"
 
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Servizo non definido"
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Non soportado polo servidor"
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Non soportado polo cliente"
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Rexeitado polo cliente"
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Resposta demasiado grande"
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Respostas perdidas"
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Solicitude denegada"
 
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Dereitos insuficientes"
 
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "Na lista local de autorizar/negar"
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente non dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Non houbo coincidencia"
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Desbordamento da lista"
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Solicitude ambigua"
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Cola chea"
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Non mentras está en AOL"
 
-#: ../src/protocols/oscar/oscar.c:346
+#: ../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 "
@@ -8911,7 +9999,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:449
+#: ../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.)"
@@ -8919,141 +10007,156 @@
 "(Produciuse un erro ao recibir esta mensaxe. É posible que o amigo co que "
 "está falando teña un cliente defectuoso.)"
 
-#: ../src/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Voz"
 
-#: ../src/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:524
+#: ../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:637 ../src/protocols/oscar/oscar.c:5793
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5853
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
-#: ../src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Xogos"
 
-#: ../src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Extensións"
 
-#: ../src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../src/protocols/oscar/oscar.c:674
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:677
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:680
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Seguridade activada"
 
-#: ../src/protocols/oscar/oscar.c:683
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "Vídeo en tempo real"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5600
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5630
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5628
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5662
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5618
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5648
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Capacidade Web"
 
-#: ../src/protocols/oscar/oscar.c:725
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "Conectado"
 
-#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2805
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../src/protocols/oscar/oscar.c:811
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:966
-msgid "Could not connect to authentication server"
-msgstr "Non se puido conectar ao servidor de autenticación"
-
-#: ../src/protocols/oscar/oscar.c:968
-msgid "Could not connect to BOS server"
-msgstr "Non se puido conectar ao servidor XEFE"
-
-#: ../src/protocols/oscar/oscar.c:998
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Non se puido conectar ao servidor de autenticación:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"Non se puido conectar ao servidor BOS:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../src/protocols/oscar/oscar.c:1003
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1034
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#: ../src/protocols/oscar/oscar.c:1219
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9064,20 +10167,25 @@
 "non é válido. Os nomes de usuario deben comezar con letras e só poden conter "
 "letras, números e espacios, ou conter só números."
 
-#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Nome de conta ou contrasinal incorrecto."
-
-#: ../src/protocols/oscar/oscar.c:1313
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Nome de usuario inválido."
+
+#: ../libgaim/protocols/oscar/oscar.c:1288
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Contrasinal incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:1293
 msgid "Your account is currently suspended."
 msgstr "Súa conta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1317
+#: ../libgaim/protocols/oscar/oscar.c:1297
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O servizo de Mensaxería Instantánea AOL está temporalmente non dispoñible."
 
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../libgaim/protocols/oscar/oscar.c:1302
 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."
@@ -9085,32 +10193,33 @@
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
 "de novo. Se segue intentándoo, necesitará agardar incluso máis tempo."
 
-#: ../src/protocols/oscar/oscar.c:1327
+#: ../libgaim/protocols/oscar/oscar.c:1307
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "A versión do cliente que usa é demasiado antiga. Por favor, actualícea en %s"
 
-#: ../src/protocols/oscar/oscar.c:1363
+#: ../libgaim/protocols/oscar/oscar.c:1342
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../src/protocols/oscar/oscar.c:1368
+#: ../libgaim/protocols/oscar/oscar.c:1347
 msgid "Received authorization"
 msgstr "Recibiuse a autorización"
 
-#: ../src/protocols/oscar/oscar.c:1391
+#: ../libgaim/protocols/oscar/oscar.c:1370
 msgid "The SecurID key entered is invalid."
 msgstr "A clave SecurID que se introduciu non é válida."
 
-#: ../src/protocols/oscar/oscar.c:1405
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter SecurID"
 msgstr "Introduza SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1406
+#: ../libgaim/protocols/oscar/oscar.c:1385
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."
 
-#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
+#: ../libgaim/protocols/oscar/oscar.c:1425
+#: ../libgaim/protocols/oscar/oscar.c:1468
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9119,36 +10228,41 @@
 "Quizais sexa desconectado en breve. Pode quere usar TOC ata que se resolva "
 "isto. Comprobe %s para novidades."
 
-#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
+#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libgaim/protocols/oscar/oscar.c:1471
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim non puido obter un hash de conexión a AIM válido."
 
-#: ../src/protocols/oscar/oscar.c:1569
+#: ../libgaim/protocols/oscar/oscar.c:1557
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizais sexa desconectado en breve. Comprobe %s para novidades."
 
-#: ../src/protocols/oscar/oscar.c:1572
+#: ../libgaim/protocols/oscar/oscar.c:1560
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim non puido obter un hash de conexión válido."
 
-#: ../src/protocols/oscar/oscar.c:1598
+#: ../libgaim/protocols/oscar/oscar.c:1586
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../src/protocols/oscar/oscar.c:2156
+#: ../libgaim/protocols/oscar/oscar.c:1642
+msgid "Unable to initialize connection"
+msgstr "Imposible inicializar a conexión"
+
+#: ../libgaim/protocols/oscar/oscar.c:2140
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que poida engadirlle a miña lista de amigos."
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorización:"
 
-#: ../src/protocols/oscar/oscar.c:2166
+#: ../libgaim/protocols/oscar/oscar.c:2150
 msgid "Please authorize me!"
 msgstr "Por favor, autoríceme!"
 
-#: ../src/protocols/oscar/oscar.c:2200
+#: ../libgaim/protocols/oscar/oscar.c:2182
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9157,25 +10271,28 @@
 "O usuario %s require autorización antes de permitir que o incorporen a unha "
 "lista de amigos. Desexa enviar unha solicitude de autorización?"
 
-#: ../src/protocols/oscar/oscar.c:2205
+#: ../libgaim/protocols/oscar/oscar.c:2187
 msgid "Request Authorization"
 msgstr "Pedir autorización"
 
-#: ../src/protocols/oscar/oscar.c:2207
+#: ../libgaim/protocols/oscar/oscar.c:2189
 msgid "_Request Authorization"
 msgstr "_Pedir autorización"
 
-#: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
-#: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5025 ../src/protocols/oscar/oscar.c:5077
+#: ../libgaim/protocols/oscar/oscar.c:2230
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:2344
+#: ../libgaim/protocols/oscar/oscar.c:2368
+#: ../libgaim/protocols/oscar/oscar.c:5055
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "No reason given."
 msgstr "Non se indicou un razón."
 
-#: ../src/protocols/oscar/oscar.c:2258
+#: ../libgaim/protocols/oscar/oscar.c:2236
 msgid "Authorization Denied Message:"
 msgstr "Mensaxe de autorización denegada:"
 
-#: ../src/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2346
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9184,11 +10301,12 @@
 "O usuario %u quere engadir a %s á súa lista de amigos polo seguinte motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5037
+#: ../libgaim/protocols/oscar/oscar.c:2356
+#: ../libgaim/protocols/oscar/oscar.c:5067
 msgid "Authorization Request"
 msgstr "Solicitude de autorización"
 
-#: ../src/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2368
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9199,17 +10317,17 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2392
+#: ../libgaim/protocols/oscar/oscar.c:2369
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2376
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "O usuario %u autorizou súa petición de engadilo a súa lista de amigos."
 
-#: ../src/protocols/oscar/oscar.c:2407
+#: ../libgaim/protocols/oscar/oscar.c:2384
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9222,7 +10340,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2415
+#: ../libgaim/protocols/oscar/oscar.c:2392
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9235,7 +10353,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2423
+#: ../libgaim/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9248,121 +10366,123 @@
 "A mensaxe é:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2444
+#: ../libgaim/protocols/oscar/oscar.c:2421
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuario ICQ %u envioulle un amigo: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2450
+#: ../libgaim/protocols/oscar/oscar.c:2427
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Desexa engadir este amigo a súa lista de amigos?"
 
-#: ../src/protocols/oscar/oscar.c:2454
+#: ../libgaim/protocols/oscar/oscar.c:2431
 msgid "_Decline"
 msgstr "_Declinar"
 
-#: ../src/protocols/oscar/oscar.c:2538
+#: ../libgaim/protocols/oscar/oscar.c:2515
 #, 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] "Vostede perdeu %hu mensaxe de %s porque non era válido."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque non eran válidos."
 
-#: ../src/protocols/oscar/oscar.c:2547
+#: ../libgaim/protocols/oscar/oscar.c:2524
 #, 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] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque eran demasiado longas."
 
-#: ../src/protocols/oscar/oscar.c:2556
+#: ../libgaim/protocols/oscar/oscar.c:2533
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Vostede perdeu %hu mensaxe de %s porque foi mandado damasiado rápido"
 msgstr[1] "Perdéronse %hu mensaxes de %s porque foron mandadas demasiado rápido"
 
-#: ../src/protocols/oscar/oscar.c:2565
+#: ../libgaim/protocols/oscar/oscar.c:2542
 #, 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] "Perdeuse %hu mensaxe de %s porque el/ela é moi malvado/a."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque el/ela é moi malvado/a."
 
-#: ../src/protocols/oscar/oscar.c:2574
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, 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] "Perdeuse %hu mensaxe de %s porque vostede é moi malvado/a."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque vostede é moi malvado/a."
 
-#: ../src/protocols/oscar/oscar.c:2583
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, 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] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
 msgstr[1] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."
 
-#: ../src/protocols/oscar/oscar.c:2639
+#: ../libgaim/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2700
+#: ../libgaim/protocols/oscar/oscar.c:2677
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC eviou o erro: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2736
+#: ../libgaim/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
-#: ../src/protocols/oscar/oscar.c:2799 ../src/protocols/oscar/oscar.c:2803
+#: ../libgaim/protocols/oscar/oscar.c:2713
+#: ../libgaim/protocols/oscar/oscar.c:2718
+#: ../libgaim/protocols/oscar/oscar.c:2780
+#: ../libgaim/protocols/oscar/oscar.c:2784
 msgid "Unknown reason."
 msgstr "Razón descoñecida."
 
-#: ../src/protocols/oscar/oscar.c:2739
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2716
+#: ../libgaim/protocols/sametime/sametime.c:2360
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
 
-#: ../src/protocols/oscar/oscar.c:2799
+#: ../libgaim/protocols/oscar/oscar.c:2780
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario non dispoñible: %s"
 
-#: ../src/protocols/oscar/oscar.c:2802
+#: ../libgaim/protocols/oscar/oscar.c:2783
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s non dispoñible:"
 
-#: ../src/protocols/oscar/oscar.c:2828
+#: ../libgaim/protocols/oscar/oscar.c:2809
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/oscar/oscar.c:2833
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2814
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../src/protocols/oscar/oscar.c:2838
+#: ../libgaim/protocols/oscar/oscar.c:2819
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../src/protocols/oscar/oscar.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:2837
 msgid "Available Message"
 msgstr "Mensaxe dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:2945
+#: ../libgaim/protocols/oscar/oscar.c:2937
 msgid "Your AIM connection may be lost."
 msgstr "Súa conexión AIM pode que se perdera."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3126
+#: ../libgaim/protocols/oscar/oscar.c:3118
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9370,11 +10490,11 @@
 "[Non se puido amosar unha mensaxe deste usuario porque contén caracteres "
 "inválidos.]"
 
-#: ../src/protocols/oscar/oscar.c:3345
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid "Rate limiting error."
 msgstr "Erro do limitador de tasa de mensaxes."
 
-#: ../src/protocols/oscar/oscar.c:3346
+#: ../libgaim/protocols/oscar/oscar.c:3340
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9383,81 +10503,84 @@
 "límite na tasa de envío de mensaxes. Por favor, agarde 10 segundos e volva a "
 "intentalo."
 
-#: ../src/protocols/oscar/oscar.c:3418
+#: ../libgaim/protocols/oscar/oscar.c:3412
 msgid "You have been signed off for an unknown reason."
 msgstr "Foi desconectado por motivos descoñecidos."
 
-#: ../src/protocols/oscar/oscar.c:3431 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3425 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desconectado da sala de chat: %s."
 
-#: ../src/protocols/oscar/oscar.c:3649 ../src/protocols/silc/util.c:556
+#: ../libgaim/protocols/oscar/oscar.c:3646
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../src/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/oscar/oscar.c:3673
 msgid "Personal Web Page"
 msgstr "Páxina web persoal"
 
-#: ../src/protocols/oscar/oscar.c:3680
+#: ../libgaim/protocols/oscar/oscar.c:3677
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3686
+#: ../libgaim/protocols/oscar/oscar.c:3694
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../src/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Work Information"
 msgstr "Información do traballo"
 
-#: ../src/protocols/oscar/oscar.c:3703
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Division"
 msgstr "Sección"
 
-#: ../src/protocols/oscar/oscar.c:3704
+#: ../libgaim/protocols/oscar/oscar.c:3701
 msgid "Position"
 msgstr "Cargo"
 
-#: ../src/protocols/oscar/oscar.c:3706
+#: ../libgaim/protocols/oscar/oscar.c:3703
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../src/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3761
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../src/protocols/oscar/oscar.c:3804
+#: ../libgaim/protocols/oscar/oscar.c:3801
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
 msgstr[1] "Os seguintes nomes de usuarios están asociados a %s"
 
-#: ../src/protocols/oscar/oscar.c:3809
+#: ../libgaim/protocols/oscar/oscar.c:3806
 msgid "Screen name"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/oscar/oscar.c:3835
+#: ../libgaim/protocols/oscar/oscar.c:3832
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo-e %s"
 
-#: ../src/protocols/oscar/oscar.c:3856
+#: ../libgaim/protocols/oscar/oscar.c:3853
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un correo-e solicitando confirmación de %s."
 
-#: ../src/protocols/oscar/oscar.c:3858
+#: ../libgaim/protocols/oscar/oscar.c:3855
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../src/protocols/oscar/oscar.c:3889
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Error Changing Account Info"
 msgstr "Erro cambiando a información da conta"
 
-#: ../src/protocols/oscar/oscar.c:3892
+#: ../libgaim/protocols/oscar/oscar.c:3889
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9466,12 +10589,12 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado difire do orixinal."
 
-#: ../src/protocols/oscar/oscar.c:3895
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é inválido."
 
-#: ../src/protocols/oscar/oscar.c:3898
+#: ../libgaim/protocols/oscar/oscar.c:3895
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9480,7 +10603,7 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado é demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:3901
+#: ../libgaim/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9489,7 +10612,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
 "existe unha solicitude pendente para este nome de usuario."
 
-#: ../src/protocols/oscar/oscar.c:3904
+#: ../libgaim/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9498,7 +10621,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
 "enderezo dado xa ten demasiados nomes de usuarios asociados."
 
-#: ../src/protocols/oscar/oscar.c:3907
+#: ../libgaim/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9507,12 +10630,12 @@
 "Erro 0x%04x: Non es pode cambiar o enderezo de correo electrónico porque o "
 "enderezo dado é inválido."
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../libgaim/protocols/oscar/oscar.c:3907
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../src/protocols/oscar/oscar.c:3920
+#: ../libgaim/protocols/oscar/oscar.c:3917
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9521,26 +10644,27 @@
 "O formato de seu nome de usuario é actualmente o seguinte:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
+#: ../libgaim/protocols/oscar/oscar.c:3918
+#: ../libgaim/protocols/oscar/oscar.c:3925
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../src/protocols/oscar/oscar.c:3926
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
-#: ../src/protocols/oscar/oscar.c:4101
+#: ../libgaim/protocols/oscar/oscar.c:4098
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Non se enviou a súa imaxe MI. Debe estar directamente conectado para enviar "
 "imaxes MI."
 
-#: ../src/protocols/oscar/oscar.c:4341
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../src/protocols/oscar/oscar.c:4342
+#: ../libgaim/protocols/oscar/oscar.c:4351
 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 "
@@ -9550,7 +10674,7 @@
 "conexión completárase. Seu perfil quedará sen cambiar, inténteo novamente "
 "cando xa estea conectado completamente."
 
-#: ../src/protocols/oscar/oscar.c:4356
+#: ../libgaim/protocols/oscar/oscar.c:4365
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9565,11 +10689,11 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../src/protocols/oscar/oscar.c:4361
+#: ../libgaim/protocols/oscar/oscar.c:4370
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:4408
+#: ../libgaim/protocols/oscar/oscar.c:4414
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9584,11 +10708,11 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../src/protocols/oscar/oscar.c:4413
+#: ../libgaim/protocols/oscar/oscar.c:4419
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:4482
+#: ../libgaim/protocols/oscar/oscar.c:4488
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9599,16 +10723,17 @@
 "nome de usuario deben comezar con letras só poden conter letras, número e "
 "espacios, ou conter só números."
 
-#: ../src/protocols/oscar/oscar.c:4484 ../src/protocols/oscar/oscar.c:4883
-#: ../src/protocols/oscar/oscar.c:4897
+#: ../libgaim/protocols/oscar/oscar.c:4490
+#: ../libgaim/protocols/oscar/oscar.c:4903
+#: ../libgaim/protocols/oscar/oscar.c:4917
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../src/protocols/oscar/oscar.c:4588
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:4589
+#: ../libgaim/protocols/oscar/oscar.c:4595
 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 "
@@ -9617,13 +10742,16 @@
 "Gaim non pode obter neste momento a lista de amigos dos servidores de AIM. A "
 "lista non borrou, e seguramente volverá a estar dispoñible nunhas horas."
 
-#: ../src/protocols/oscar/oscar.c:4781 ../src/protocols/oscar/oscar.c:4782
-#: ../src/protocols/oscar/oscar.c:4787 ../src/protocols/oscar/oscar.c:4941
-#: ../src/protocols/oscar/oscar.c:4942 ../src/protocols/oscar/oscar.c:4947
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4799
+#: ../libgaim/protocols/oscar/oscar.c:4804
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4972
+#: ../libgaim/protocols/oscar/oscar.c:4977
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../src/protocols/oscar/oscar.c:4881
+#: ../libgaim/protocols/oscar/oscar.c:4901
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9632,11 +10760,12 @@
 "Non se puido engadir o amigo %s porque hai demasiados contactos na lista de "
 "amigos. Por favor, elimine un e volva a probar."
 
-#: ../src/protocols/oscar/oscar.c:4881 ../src/protocols/oscar/oscar.c:4895
+#: ../libgaim/protocols/oscar/oscar.c:4901
+#: ../libgaim/protocols/oscar/oscar.c:4915
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../src/protocols/oscar/oscar.c:4895
+#: ../libgaim/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9647,7 +10776,7 @@
 "habitual é que chegou ao máximo número de amigos permitidos na súa lista de "
 "amigos."
 
-#: ../src/protocols/oscar/oscar.c:4978
+#: ../libgaim/protocols/oscar/oscar.c:5008
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9656,11 +10785,11 @@
 "O usuario %s deulle permiso para engadirlle a súa lista de amigos. Desexa "
 "facelo?"
 
-#: ../src/protocols/oscar/oscar.c:4984
+#: ../libgaim/protocols/oscar/oscar.c:5014
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: ../src/protocols/oscar/oscar.c:5028
+#: ../libgaim/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9670,17 +10799,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5103
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "O usuario %s autorizou a súa solicitude de engadilo a súa lista de amigos."
 
-#: ../src/protocols/oscar/oscar.c:5074
+#: ../libgaim/protocols/oscar/oscar.c:5104
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5077
+#: ../libgaim/protocols/oscar/oscar.c:5107
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9691,41 +10820,41 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5078
+#: ../libgaim/protocols/oscar/oscar.c:5108
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../src/protocols/oscar/oscar.c:5114 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5144 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Troco:"
 
-#: ../src/protocols/oscar/oscar.c:5154
+#: ../libgaim/protocols/oscar/oscar.c:5184
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de chat inválido."
 
-#: ../src/protocols/oscar/oscar.c:5224
+#: ../libgaim/protocols/oscar/oscar.c:5254
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Non se enviou súa imaxe MI. Non se poden enviar imaxes MI en chats AIM."
 
-#: ../src/protocols/oscar/oscar.c:5386
+#: ../libgaim/protocols/oscar/oscar.c:5416
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5691
+#: ../libgaim/protocols/oscar/oscar.c:5729
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:5692
+#: ../libgaim/protocols/oscar/oscar.c:5730
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:5738
+#: ../libgaim/protocols/oscar/oscar.c:5776
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vostede pediu abrir unha conexión MI directa con %s."
 
-#: ../src/protocols/oscar/oscar.c:5742
+#: ../libgaim/protocols/oscar/oscar.c:5780
 #, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -9734,65 +10863,70 @@
 "Como isto revela seu enderezo IP, pode ser considerado como un resgo a súa "
 "privacidade. Quere continuar?"
 
-#: ../src/protocols/oscar/oscar.c:5746 ../src/protocols/oscar/peer.c:941
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../src/protocols/oscar/oscar.c:5764
+#: ../libgaim/protocols/oscar/oscar.c:5818
+msgid "Get AIM Info"
+msgstr "Obter información de AIM"
+
+#: ../libgaim/protocols/oscar/oscar.c:5824
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:5772
+#: ../libgaim/protocols/oscar/oscar.c:5832
 msgid "Get Status Msg"
 msgstr "Obter msx de estado"
 
-#: ../src/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/oscar.c:5845
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:5807
+#: ../libgaim/protocols/oscar/oscar.c:5867
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización outra vez"
 
-#: ../src/protocols/oscar/oscar.c:5864
+#: ../libgaim/protocols/oscar/oscar.c:5926
 msgid "Require authorization"
 msgstr "Pedir autorización"
 
-#: ../src/protocols/oscar/oscar.c:5867
+#: ../libgaim/protocols/oscar/oscar.c:5929
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidade web (se activa isto fará que reciba SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:5872
+#: ../libgaim/protocols/oscar/oscar.c:5934
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../src/protocols/oscar/oscar.c:5889
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "The new formatting is invalid."
 msgstr "O novo formato é inválido."
 
-#: ../src/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:5952
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "O formato do nome de usuario só pode cambiar na capitalización e espacio en "
 "branco."
 
-#: ../src/protocols/oscar/oscar.c:5897
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:5953
+#: ../libgaim/protocols/oscar/oscar.c:6015
 msgid "Change Address To:"
 msgstr "Cambiar enderezo a:"
 
-#: ../src/protocols/oscar/oscar.c:5998
+#: ../libgaim/protocols/oscar/oscar.c:6060
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../src/protocols/oscar/oscar.c:6001
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorización dos seguintes amigos"
 
-#: ../src/protocols/oscar/oscar.c:6002
+#: ../libgaim/protocols/oscar/oscar.c:6064
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9800,71 +10934,69 @@
 "Pode volver a pedir autorización a estos amigos premendo o botón dereito do "
 "rato sobre eles e escollendo \"Solicitar autorización outra vez.\""
 
-#: ../src/protocols/oscar/oscar.c:6019
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Find Buddy by E-Mail"
 msgstr "Procurar un amigo polo correo electrónico"
 
-#: ../src/protocols/oscar/oscar.c:6020
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo polo enderezo de correo electrónico"
 
-#: ../src/protocols/oscar/oscar.c:6021
+#: ../libgaim/protocols/oscar/oscar.c:6083
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriba o enderezo de correo electrónico do amigo que está buscando."
 
-#: ../src/protocols/oscar/oscar.c:6190
+#: ../libgaim/protocols/oscar/oscar.c:6252
 msgid "Set User Info (URL)..."
 msgstr "Establecer súa información de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6201
+#: ../libgaim/protocols/oscar/oscar.c:6263
 msgid "Change Password (URL)"
 msgstr "Trocar contrasinal (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6205
+#: ../libgaim/protocols/oscar/oscar.c:6267
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6215
+#: ../libgaim/protocols/oscar/oscar.c:6277
 msgid "Set Privacy Options..."
 msgstr "Establecer opcións de privacidade..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6222
+#: ../libgaim/protocols/oscar/oscar.c:6284
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../libgaim/protocols/oscar/oscar.c:6288
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../src/protocols/oscar/oscar.c:6230
-#, fuzzy
+#: ../libgaim/protocols/oscar/oscar.c:6292
 msgid "Display Currently Registered E-Mail Address"
-msgstr "Mostrar enderezo rexistrado actualmente"
-
-#: ../src/protocols/oscar/oscar.c:6234
-#, fuzzy
+msgstr "Mostrar enderezos de correo rexistrados actualmente"
+
+#: ../libgaim/protocols/oscar/oscar.c:6296
 msgid "Change Currently Registered E-Mail Address..."
-msgstr "Cambiar o enderezo rexistrado..."
-
-#: ../src/protocols/oscar/oscar.c:6241
+msgstr "Cambiar o enderezo de correo rexistrado actualmente..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6303
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Amosar amigos pendentes de autorización"
 
-#: ../src/protocols/oscar/oscar.c:6247
+#: ../libgaim/protocols/oscar/oscar.c:6309
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar un amigo polo enderezo de correo electrónico..."
 
-#: ../src/protocols/oscar/oscar.c:6252
+#: ../libgaim/protocols/oscar/oscar.c:6314
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través da súa información"
 
-#: ../src/protocols/oscar/oscar.c:6318
+#: ../libgaim/protocols/oscar/oscar.c:6382
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos recente"
 
-#: ../src/protocols/oscar/oscar.c:6321
+#: ../libgaim/protocols/oscar/oscar.c:6385
 msgid "Show how long you have been idle"
 msgstr "Amosar canto tempo estivo inactivo"
 
@@ -9878,174 +11010,912 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6446 ../src/protocols/oscar/oscar.c:6448
+#: ../libgaim/protocols/oscar/oscar.c:6511
+#: ../libgaim/protocols/oscar/oscar.c:6513
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:6473 ../src/protocols/zephyr/zephyr.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:6538
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../src/protocols/oscar/oscar.c:6477
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6542
+#, fuzzy
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
 "Empregar sempre un servidor proxy de AIM/ICQ\n"
 "(máis lento, pero non revela o teu enderezo IP)"
 
-#: ../src/protocols/oscar/peer.c:613
+#: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
 #, fuzzy, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/oscar/peer.c:753
+#: ../libgaim/protocols/oscar/peer.c:803
 #, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/oscar/peer.c:931
+#: ../libgaim/protocols/oscar/peer.c:980
 #, fuzzy, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/oscar/peer.c:935
+#: ../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 ""
 
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "Información primaria"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "Introdución persoal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "Número QQ"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+#, fuzzy
+msgid "College"
+msgstr "_Contraer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "Email"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "Código postal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+#, fuzzy
+msgid "Cellphone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+#, fuzzy
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "Piscis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "Aries"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+#, fuzzy
+msgid "Taurus"
+msgstr "Turco"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "Xéminis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "Cáncer"
+
+#: ../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 ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+#, fuzzy
+msgid "Rat"
+msgstr "En bruto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+#, fuzzy
+msgid "Tiger"
+msgstr "Título"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+#, fuzzy
+msgid "Snake"
+msgstr "Gardar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+#, fuzzy
+msgid "Monkey"
+msgstr "Ningún"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+#, fuzzy
+msgid "Rooster"
+msgstr "Rexistrar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+#, fuzzy
+msgid "Pig"
+msgstr "Ping"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Outro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Modificar a miña información"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Actualizar a miña información"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "A súa información foi actualizada"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, fuzzy, c-format
+msgid "You rejected %d's request"
+msgstr "Solicitude non esperada"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Introduza a súa razón:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Rexeitar solicitude"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Síntoo, non eres o meu tipo..."
+
+#: ../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 "Rexeitar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+#, fuzzy
+msgid "Add buddy with auth request fails"
+msgstr "Engadir o amigo a súa lista?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "Eliminou correctamente un amigo"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "O usuario %d necesita autenticación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Introduza a solicitude aquí"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr ""
+
+#: ../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 "Enviar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, fuzzy, c-format
+msgid "You have added %d in buddy list"
+msgstr "O usuario %s engadiuno á súa lista de amigos."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "Erro de QQid"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "QQid inválido"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "ID de grupo"
+
+#: ../libgaim/protocols/qq/group.c:98
+#, fuzzy
+msgid "Creator"
+msgstr "Crear"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "Descrición do grupo"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "Autorizar"
+
+#: ../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 "Introduza un ID de grupo externo"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, fuzzy, c-format
+msgid "User %d applied to join group %d"
+msgstr "O usuario non está no grupo"
+
+#: ../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 "Razón: %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
+#, fuzzy
+msgid "QQ Qun Operation"
+msgstr "Opcións de son"
+
+#: ../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 ""
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+#, fuzzy
+msgid "This group has been added to your buddy list"
+msgstr "O usuario %s engadiuno á súa lista de amigos."
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "Non son un membro"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "Son un membro"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "Son o administrador"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "Estado descoñecido"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+#, fuzzy
+msgid "This group does not allow others to join"
+msgstr ""
+"Esta versión de evaluación non permite a conexión simultánea de máis de dez "
+"usuarios"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:354
+#, fuzzy
+msgid "Are you sure to exit this Qun?"
+msgstr "Está seguro de que quere borrar %s?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "Erro de operación de grupo"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+#, fuzzy
+msgid "Would you like to set up the Qun details now?"
+msgstr "Desexa establecela coma a icona de amigo para este usuario?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+#, fuzzy
+msgid "Setup"
+msgstr "_Establecer"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "Mensaxe do sistema"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "Servidor ACK"
+
+#: ../libgaim/protocols/qq/im.c:565
+#, fuzzy
+msgid "Send IM fail\n"
+msgstr "Enviar correo electrónico"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Contrasinal erróneo!"
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Non se puido conectar."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Dispoñible"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Ausente"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Desconectado"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Nome inválido"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Selección"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Seleccionar un número"
+
+#: ../libgaim/protocols/qq/qq.c:451
+#, fuzzy
+msgid "Faces"
+msgstr "Xogos"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, fuzzy
+msgid "Change Face"
+msgstr "Cambiar estado"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, fuzzy, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Título do grupo:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Última actualización</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Modo de conexión</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP do servidor</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>A miña IP pública</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:522
+msgid "<i>Information below may not be accurate</i><br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, fuzzy, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Título do grupo:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, fuzzy, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>ID de usuario:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, fuzzy, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Último cliente coñecido:</b>"
+
+#: ../libgaim/protocols/qq/qq.c:530
+#, fuzzy
+msgid "Login Information"
+msgstr "Información de depuración"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Modificar a miña información"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Cambiar o contrasinal"
+
+#: ../libgaim/protocols/qq/qq.c:811
+#, fuzzy
+msgid "Show Login Information"
+msgstr "Información de depuración"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Por favor, agarde por unha nova versión"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "Protocolo QQ\tComplemento"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+#, fuzzy
+msgid "Login in TCP"
+msgstr "Unirse a un chat"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+#, fuzzy
+msgid "Login Hidden"
+msgstr "Opcións de conexión"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+#, fuzzy
+msgid "Socket send error"
+msgstr "Erro de token"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Conexión rexeitada"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Erro de Socket"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "Non se puido ler do socket"
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, fuzzy, c-format
+msgid "%d has declined the file %s"
+msgstr "%s cambiou o tópico a: %s"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "Envío de ficheiro"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, fuzzy, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%s cancelou a transferencia de %s"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Conexión perdida!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Fallou a conexión, sen resposta!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+#, fuzzy
+msgid "Connection timeout!"
+msgstr "Expirou a conexión"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+#, fuzzy
+msgid "User info is not updated"
+msgstr "O usuario non está no grupo"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+#, fuzzy
+msgid "Send packet"
+msgstr "Enviando cookie"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+#, fuzzy
+msgid "Do you wanna add this buddy?"
+msgstr "Desexa engadir este amigo a súa lista de amigos?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, fuzzy, c-format
+msgid "You have been added by %s"
+msgstr "Foi expulsado por %s (%s)"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+#, fuzzy
+msgid "Would like to add him?"
+msgstr "Quere sobrescribilo?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, fuzzy, c-format
+msgid "%s has added you [%s]"
+msgstr "%s conectouse (%s)"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, fuzzy, c-format
+msgid "User %s rejected your request"
+msgstr "O usuario remoto rexeitou a túa petición."
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, fuzzy, c-format
+msgid "User %s has approved your request"
+msgstr "O usuario remoto rexeitou a túa petición."
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, fuzzy, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s quere enviarlle un ficheiro"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, fuzzy, c-format
+msgid "Message: %s"
+msgstr "_Mensaxe:"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, fuzzy, c-format
+msgid "%s is not in your buddy list"
+msgstr "O usuario %s engadiuno á súa lista de amigos."
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+#, fuzzy
+msgid "Would you like to add him?"
+msgstr "Quere sobrescribilo?"
+
+#: ../libgaim/protocols/sametime/sametime.c:414
 msgid "Connection closed (writing)"
 msgstr "Conexión pechada (escribindo)"
 
-#: ../src/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1260
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID de grupo Notes:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1263
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre o grupo %s"
 
-#: ../src/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1265
 msgid "Notes Address Book Information"
 msgstr "Información do libro de enderezos Notes"
 
-#: ../src/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1297
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo á conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1307
 msgid "Get Notes Address Book Info"
 msgstr "Obter a información do libro de enderezos Notes"
 
-#: ../src/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1460
 msgid "Sending Handshake"
 msgstr "Enviando negociación"
 
-#: ../src/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1465
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Agardando á aceptación do saúdo inicial"
 
-#: ../src/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1470
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Aceptouse o saúdo inicial. Enviando a identificación"
 
-#: ../src/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1475
 msgid "Waiting for Login Acknowledgement"
 msgstr "Agardando á aceptación da identificación"
 
-#: ../src/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1480
 msgid "Login Redirected"
 msgstr "Conexión redirixida"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1486
 msgid "Forcing Login"
 msgstr "Forzando conexión"
 
-#: ../src/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1490
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: ../src/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1495
 msgid "Starting Services"
 msgstr "Iniciando servizos"
 
-#: ../src/protocols/sametime/sametime.c:1501
+#: ../libgaim/protocols/sametime/sametime.c:1500
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1598
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrador de Sametime eviou o seguinte anuncio no servidor %s"
 
-#: ../src/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1603
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1656
+#: ../libgaim/protocols/sametime/sametime.c:1655
 msgid "Connection reset"
 msgstr "Conexión reiniciada"
 
-#: ../src/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1662
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1692
-#: ../src/protocols/sametime/sametime.c:3688
+#: ../libgaim/protocols/sametime/sametime.c:1685
+#: ../libgaim/protocols/sametime/sametime.c:3681
 msgid "Unable to connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../src/protocols/sametime/sametime.c:1730
+#: ../libgaim/protocols/sametime/sametime.c:1723
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../src/protocols/sametime/sametime.c:1904
+#: ../libgaim/protocols/sametime/sametime.c:1897
 msgid "Conference Closed"
 msgstr "Conferencia pechada"
 
-#: ../src/protocols/sametime/sametime.c:2361
+#: ../libgaim/protocols/sametime/sametime.c:2354
 msgid "Unable to send message: "
 msgstr "Non se puido enviar a mensaxe: "
 
-#: ../src/protocols/sametime/sametime.c:2918
+#: ../libgaim/protocols/sametime/sametime.c:2911
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../src/protocols/sametime/sametime.c:3209
+#: ../libgaim/protocols/sametime/sametime.c:3202
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../src/protocols/sametime/sametime.c:3210
+#: ../libgaim/protocols/sametime/sametime.c:3203
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../src/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3204
 msgid "Video Camera"
 msgstr "Video cámara"
 
-#: ../src/protocols/sametime/sametime.c:3215
+#: ../libgaim/protocols/sametime/sametime.c:3208
 msgid "File Transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../src/protocols/sametime/sametime.c:3249
+#: ../libgaim/protocols/sametime/sametime.c:3242
 #, c-format
 msgid ""
 "\n"
@@ -10054,7 +11924,7 @@
 "\n"
 "<b>Soporte:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3254
+#: ../libgaim/protocols/sametime/sametime.c:3247
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10062,11 +11932,11 @@
 "\n"
 "<b>Usuario externo</b>"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3353
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../src/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3354
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10075,27 +11945,27 @@
 "Por favor introduza un tema para a nova conferencia, e unha mensaxe de "
 "invitación que se enviará a %s"
 
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3358
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3360
 msgid "Create"
 msgstr "Crear"
 
-#: ../src/protocols/sametime/sametime.c:3431
+#: ../libgaim/protocols/sametime/sametime.c:3424
 msgid "Available Conferences"
 msgstr "Conferencias dispoñibles"
 
-#: ../src/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3430
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../libgaim/protocols/sametime/sametime.c:3437
 msgid "Invite user to a conference"
 msgstr "Invitar ao usuario a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3438
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10106,27 +11976,23 @@
 "Seleccione \"Crear nova conferencia\" se quere crear unha nova conferencia "
 "para invitar a este usuario tamén."
 
-#: ../src/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3443
 msgid "Invite to Conference"
 msgstr "Invitar a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../src/protocols/sametime/sametime.c:3540
+#: ../libgaim/protocols/sametime/sametime.c:3533
 msgid "Invite to Conference..."
 msgstr "Invitar a unha conferencia.."
 
-#: ../src/protocols/sametime/sametime.c:3545
+#: ../libgaim/protocols/sametime/sametime.c:3538
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de PROBA"
 
-#: ../src/protocols/sametime/sametime.c:3592
+#: ../libgaim/protocols/sametime/sametime.c:3585
 msgid "No Sametime Community Server specified"
 msgstr "Non se especificou o servidor de comunidade Sametime"
 
-#: ../src/protocols/sametime/sametime.c:3614
+#: ../libgaim/protocols/sametime/sametime.c:3607
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10135,62 +12001,62 @@
 "Non se configurou ningún enderezo IP ou nome de equipo para a conta "
 "Meanwhile %s. Introduza un máis abaixo para continuar o rexistro."
 
-#: ../src/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:3612
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración da conexión Meanwhile"
 
-#: ../src/protocols/sametime/sametime.c:3620
+#: ../libgaim/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4077
+#: ../libgaim/protocols/sametime/sametime.c:4075
 msgid "<b>External User</b><br>"
 msgstr "<b>Usuario externo</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4080
+#: ../libgaim/protocols/sametime/sametime.c:4078
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>ID de usuario:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4086
+#: ../libgaim/protocols/sametime/sametime.c:4084
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Nome completo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4092
+#: ../libgaim/protocols/sametime/sametime.c:4090
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Último cliente coñecido:</b>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../libgaim/protocols/sametime/sametime.c:4098
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Descoñecido (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../libgaim/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Soporta:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4113
+#: ../libgaim/protocols/sametime/sametime.c:4111
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Estado:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4256
-#: ../src/protocols/sametime/sametime.c:5419
+#: ../libgaim/protocols/sametime/sametime.c:4254
+#: ../libgaim/protocols/sametime/sametime.c:5418
 msgid "User Name"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/sametime/sametime.c:4259
-#: ../src/protocols/sametime/sametime.c:5422
+#: ../libgaim/protocols/sametime/sametime.c:4257
+#: ../libgaim/protocols/sametime/sametime.c:5421
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4283
+#: ../libgaim/protocols/sametime/sametime.c:4281
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../src/protocols/sametime/sametime.c:4284
+#: ../libgaim/protocols/sametime/sametime.c:4282
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10200,15 +12066,15 @@
 "favor seleccione o usuario da lista amosada para engadilo a súa lista de "
 "amigos."
 
-#: ../src/protocols/sametime/sametime.c:4289
+#: ../libgaim/protocols/sametime/sametime.c:4287
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../src/protocols/sametime/sametime.c:4359
+#: ../libgaim/protocols/sametime/sametime.c:4357
 msgid "Unable to add user: user not found"
 msgstr "Non se puido engadir ao usuario: usuario non atopado"
 
-#: ../src/protocols/sametime/sametime.c:4361
+#: ../libgaim/protocols/sametime/sametime.c:4359
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10217,11 +12083,11 @@
 "O identificador '%s' non coincide con ningún usuario na comunidade Sametime. "
 "Eliminouse esta entrada da lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4364
 msgid "Unable to add user"
 msgstr "Imposible engadir ao usuario"
 
-#: ../src/protocols/sametime/sametime.c:4938
+#: ../libgaim/protocols/sametime/sametime.c:4936
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10230,63 +12096,63 @@
 "Erro lendo o ficheiro %s: \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5069
+#: ../libgaim/protocols/sametime/sametime.c:5068
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../libgaim/protocols/sametime/sametime.c:5073
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento da lista de amigos"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../libgaim/protocols/sametime/sametime.c:5076
 msgid "Local Buddy List Only"
 msgstr "Só lista de amigos local"
 
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../libgaim/protocols/sametime/sametime.c:5078
 msgid "Merge List from Server"
 msgstr "Combinar lista desde o servidor"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../libgaim/protocols/sametime/sametime.c:5080
 msgid "Merge and Save List to Server"
 msgstr "Combinar e gardar a lista no servidor"
 
-#: ../src/protocols/sametime/sametime.c:5083
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Synchronize List with Server"
 msgstr "Sincronizar a lista co servidor"
 
-#: ../src/protocols/sametime/sametime.c:5132
+#: ../libgaim/protocols/sametime/sametime.c:5131
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar a lista Sametime para a conta %s"
 
-#: ../src/protocols/sametime/sametime.c:5171
+#: ../libgaim/protocols/sametime/sametime.c:5170
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar a lista Sametime para a conta %s"
 
-#: ../src/protocols/sametime/sametime.c:5224
+#: ../libgaim/protocols/sametime/sametime.c:5223
 msgid "Unable to add group: group exists"
 msgstr "Imposible engadir o grupo: o grupo existe"
 
-#: ../src/protocols/sametime/sametime.c:5225
+#: ../libgaim/protocols/sametime/sametime.c:5224
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo chamado '%s' xa existe na súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5228
-#: ../src/protocols/sametime/sametime.c:5357
+#: ../libgaim/protocols/sametime/sametime.c:5227
+#: ../libgaim/protocols/sametime/sametime.c:5356
 msgid "Unable to add group"
 msgstr "Imposible engadir o grupo"
 
-#: ../src/protocols/sametime/sametime.c:5287
+#: ../libgaim/protocols/sametime/sametime.c:5286
 msgid "Possible Matches"
 msgstr "Coincidencias posibles"
 
-#: ../src/protocols/sametime/sametime.c:5303
+#: ../libgaim/protocols/sametime/sametime.c:5302
 msgid "Notes Address Book group results"
 msgstr "Resultados das notas dos grupos do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5304
+#: ../libgaim/protocols/sametime/sametime.c:5303
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10297,15 +12163,15 @@
 "de enderezos. Escolla o grupo mái apropiado da lista que se amosa abaixo "
 "para engadilo a súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5309
+#: ../libgaim/protocols/sametime/sametime.c:5308
 msgid "Select Notes Address Book"
 msgstr "Seleccionar notas do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5351
+#: ../libgaim/protocols/sametime/sametime.c:5350
 msgid "Unable to add group: group not found"
 msgstr "Imposible engadir o grupo: grupo non atopado"
 
-#: ../src/protocols/sametime/sametime.c:5353
+#: ../libgaim/protocols/sametime/sametime.c:5352
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10314,11 +12180,11 @@
 "O identificador '%s' non coincide con ningunha das notas dos grupos do libro "
 "de enderezos nas súa comunidade Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5393
 msgid "Notes Address Book Group"
 msgstr "Notas do grupo do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5395
+#: ../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."
@@ -10326,12 +12192,12 @@
 "Introduza o nome dun grupo do libro de enderezos Notes no campo a "
 "continuación para engadir o grupo e os seus membros na súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5442
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca para '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5444
+#: ../libgaim/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10342,24 +12208,24 @@
 "continuación. Pode engadir estos usuarios a súa lista de amigos ou "
 "enviarlles mensaxes cos botóns de accións amosados abaixo."
 
-#: ../src/protocols/sametime/sametime.c:5476
+#: ../libgaim/protocols/sametime/sametime.c:5475
 msgid "No matches"
 msgstr "Non houbo coincidencia"
 
-#: ../src/protocols/sametime/sametime.c:5477
+#: ../libgaim/protocols/sametime/sametime.c:5476
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5481
+#: ../libgaim/protocols/sametime/sametime.c:5480
 msgid "No Matches"
 msgstr "Non houbo coincidencia"
 
-#: ../src/protocols/sametime/sametime.c:5518
+#: ../libgaim/protocols/sametime/sametime.c:5517
 msgid "Search for a user"
 msgstr "Procurar un usuario"
 
-#: ../src/protocols/sametime/sametime.c:5519
+#: ../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."
@@ -10367,83 +12233,83 @@
 "Introduza o nome ou identificador parcial no campo amosado a continuación "
 "para procurar usuarios coincidentes na súa comunidade Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5522
+#: ../libgaim/protocols/sametime/sametime.c:5521
 msgid "User Search"
 msgstr "Busca de usuario"
 
-#: ../src/protocols/sametime/sametime.c:5534
+#: ../libgaim/protocols/sametime/sametime.c:5533
 msgid "Import Sametime List..."
 msgstr "Importar a lista Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5538
+#: ../libgaim/protocols/sametime/sametime.c:5537
 msgid "Export Sametime List..."
 msgstr "Exportar a lista Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Add Notes Address Book Group..."
 msgstr "Engadir notas ao grupo do libro de enderezos..."
 
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../libgaim/protocols/sametime/sametime.c:5545
 msgid "User Search..."
 msgstr "Busca de usuario..."
 
-#: ../src/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/sametime/sametime.c:5642
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redireccións do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5653
+#: ../libgaim/protocols/sametime/sametime.c:5652
 msgid "Hide client identity"
 msgstr "Agochar identificación do cliente"
 
-#: ../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 "O usuario %s non está dispoñible na rede"
 
-#: ../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 "Acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Non se puido establecer o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Produciuse un erro durante o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Fallou o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Expirou o tempo durante o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Interrumpiuse o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Iniciouse xa o acordo de claves"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Non se pode comezar o acordo de claves consigo mesmo"
 
-#: ../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 "O usuario remoto xa non está activo dentro da rede"
 
-#: ../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 "
@@ -10452,7 +12318,7 @@
 "Recibiuse unha solicitude de acordo de claves de %s. Desexa realizar o troco "
 "de claves?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10463,59 +12329,60 @@
 "Servidor remoto: %s\n"
 "Porto remoto: %d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Solicitude de acordo de claves"
 
-#: ../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 "MI con contrasinal"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Non se puido establecer a clave MI"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Establecer contrasinal MI"
 
-#: ../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 "Obter clave pública"
 
-#: ../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 "Non se puido obter a clave pública"
 
-#: ../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 "Amosar clave pública"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:237
+#: ../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 "Non se puido cargar a clave pública"
 
-#: ../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 "Información de usuario"
 
-#: ../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 "Non se puido obter a información do usuario %s"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Non se confía no amigo %s"
 
-#: ../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."
@@ -10524,16 +12391,16 @@
 "Pode empregar o comando \"Obter clave pública\" para importala."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../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 "Non se atopa o amigo %s na rede"
 
-#: ../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."
@@ -10541,15 +12408,15 @@
 "Para engadir ao amigo debe importar súa clave pública. Prema Importar para "
 "importar unha clave pública."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Seleccione o usuario correcto"
 
-#: ../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."
@@ -10557,7 +12424,7 @@
 "Atopouse máis dun usuario coa mesma clave pública. Seleccione o usuario que "
 "desexa engadir a súa lista de amigos da lista amosada."
 
-#: ../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."
@@ -10565,213 +12432,213 @@
 "Atopouse máis dun usuario co mesmo nome. Seleccione o usuario que desexa "
 "engadir a súa lista de amigos da lista amosada."
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Desligado"
 
-#: ../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 "Indisposto"
 
-#: ../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 "Despértame"
 
-#: ../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 "Hiper-activo"
 
-#: ../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:487
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:495
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Avergoñado"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:497
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:501
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Durmido"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:503
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:505
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:507
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../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 "Modos de usuario"
 
-#: ../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 "Ánimo"
 
-#: ../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 "Contacto preferido"
 
-#: ../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 "Linguaxe preferida"
 
-#: ../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 "Dispositivo"
 
-#: ../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 "Zona horaria"
 
-#: ../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 "Localización"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Borrar a clave MI"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "MI con troco de claves"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "MI con contrasinal"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Obter clave pública..."
 
-#: ../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 "Matar usuario"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Escribir no encerado"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "Con_trasinal:"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Non existe o canle %s na rede"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Información do canle"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Non se puido trocar a información do canle"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome do canle:</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>Número de usuarios:</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>Fundador do canle:</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>Cifrado do canle:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../src/protocols/silc/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canle:</b> %s"
 
-#: ../src/protocols/silc/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tópico do canle:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:152
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canle:</b> "
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Pegada dactilar do fundador:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Pegada Babble do fundador:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Engadir clave pública do canle"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: ../src/protocols/silc/chat.c:400
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Contrasinal do canle"
 
-#: ../src/protocols/silc/chat.c:407
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas do canle"
 
-#: ../src/protocols/silc/chat.c:412
+#: ../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 "
@@ -10785,324 +12652,320 @@
 "conectarse os usuarios que están na lista de claves públicas se se utilizan "
 "claves públicas para o acceso."
 
-#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:906
+#: ../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 "Autenticación do canle"
 
-#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Engadir / Eliminar"
 
-#: ../src/protocols/silc/chat.c:578
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../src/protocols/silc/chat.c:582 ../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 "Contrasinal"
 
-#: ../src/protocols/silc/chat.c:593
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduza o nome do grupo de canles privados %s e un contrasinal."
 
-#: ../src/protocols/silc/chat.c:595
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Engadir grupo de canles privados"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: ../src/protocols/silc/chat.c:723
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fixar un límite de usuarios no canle. Poñer a cero para quitar o límite de "
 "usuarios."
 
-#: ../src/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Obter información"
-
-#: ../src/protocols/silc/chat.c:886
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../src/protocols/silc/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Lista de vetados"
 
-#: ../src/protocols/silc/chat.c:899
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Engadir grupo privado"
 
-#: ../src/protocols/silc/chat.c:912
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../src/protocols/silc/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Fixado permanente"
 
-#: ../src/protocols/silc/chat.c:925
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: ../src/protocols/silc/chat.c:931
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Quitar restriccións de tópicos"
 
-#: ../src/protocols/silc/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Establecer restriccións de tópico"
 
-#: ../src/protocols/silc/chat.c:943
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Limpar canle privado"
 
-#: ../src/protocols/silc/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Establecer canle privado"
 
-#: ../src/protocols/silc/chat.c:955
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Limpar canle secreto"
 
-#: ../src/protocols/silc/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Establecer canle secreto"
 
-#: ../src/protocols/silc/chat.c:1034
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "É o fundador do canle en <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1038
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canle en <I>%s</I> é <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1097
+#: ../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 "Ten que unirse ao canle %s antes de poder unirse ao grupo privado"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1100
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Non se pode unir a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "Comando de chamada"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "Non se pode chamar o comando"
 
-#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "Comando descoñecido"
 
-#: ../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 "Transferencia segura de ficheiros"
 
-#: ../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 "Erro durante a transferencia de ficheiros"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Fallou o acordo de claves"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Non existe a sesión de transferencia de ficheiros"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Non hai ningunha sesión de transferencia de ficheiros activa"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Hase iniciar xa a transferencia de ficheiros"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "Non se puido realizar o acordo de claves para realizar a transferencia de "
 "ficheiros"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Non se puido comezar a transferencia de ficheiros."
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Non se pode enviar o ficheiro."
 
-#: ../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 cambiou o tópico de <I>%s</I> a: %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> fixou os modos do canle <I>%s</I> a: %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> quitou todos os modos do canle <I>%s</I>"
 
-#: ../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> fixou os modos do usuario <I>%s</I> a: %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> quitou todos os modos do usuario <I>%s</I>"
 
-#: ../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 "Foi expulsado de <I>%s</I> por <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 "Foi expulsado por %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 "Expulsado por %s (%s)"
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado do servidor"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Día de nacemento"
 
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../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 "Organización"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../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 "Pegada dixital da clave pública"
 
-#: ../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 "Pegada babble da clave pública"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Máis..."
 
-#: ../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 "Desligar do servidor"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Non se pode desligar"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Non se pode establecer o tópico"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Non se pode trocar o alcume"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Non pode obter a lista de salas"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Non se recibiu unha clave pública"
 
-#: ../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 "Información do servidor"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr "Non se pode obter a información do servidor"
 
-#: ../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 "Estatísticas do servidor"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr "Non se pode obter as estatísticas do servidor"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "Non se dispoñen de estatísticas do servidor"
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11137,102 +13000,102 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encamiñadores en total: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr "Estatísticas de rede"
 
-#: ../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 "Fallou o ping"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr "Recibiuse unha resposta ao ping do servidor"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr "Non se puido expulsar ao usuario"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr "Fallou o troco de claves"
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1721
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Produciuse un erro ao retomar a sesión desligada. Prema Reconectar para "
 "crear unha nova conexión."
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"
 
-#: ../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 "Reanudando a sesión"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr "Autenticando a conexión"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr "Comprobando a clave pública do servidor"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr "Necesítase un contrasinal"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fallo: Existe unha diferencia nas versións, por favor, actualice seu cliente"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: O servidor remoto non soporta/confía na súa clave pública"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: O servidor remoto non soporta o grupo de IC proposto"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fallo: O servidor remoto non soporta os sistemas de cifrado propostos"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: O servidor remoto non soporta os PKCS propostos"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: O servidor remoto non soporta a función de hash proposta"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: O servidor remoto non soporta o HMAC proposto"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Sinatura incorrecta"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"
 
-#: ../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 "
@@ -11241,12 +13104,12 @@
 "Recibiuse a clave pública de %s. Súa copia local non coincide con esta "
 "clave. Desexa aceptar a clave pública de todas maneiras?"
 
-#: ../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 "Recibiuse a clave pública de %s. Desexa aceptar esta clave pública?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11259,65 +13122,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 "Verificar a clave pública"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública non sopotada"
 
-#: ../src/protocols/silc/silc.c:158
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "Fallou a conexión"
 
-#: ../src/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"
 
-#: ../src/protocols/silc/silc.c:202
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "Realizando troco de claves"
 
-#: ../src/protocols/silc/silc.c:287
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-#: ../src/protocols/silc/silc.c:328
+#: ../libgaim/protocols/silc/silc.c:323
 msgid "Cannot initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
-#: ../src/protocols/silc/silc.c:335
+#: ../libgaim/protocols/silc/silc.c:330
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Non se pode atopar ou acceder ao directorio ~/.silc"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"
 
-#: ../src/protocols/silc/silc.c:349
+#: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Non se puido cargar a chave pública SILC: %s"
 
-#: ../src/protocols/silc/silc.c:369
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "Imposible crear a conexión"
 
-#: ../src/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Seu estado de ánimo actual"
 
-#: ../src/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../src/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11325,43 +13188,43 @@
 "\n"
 "Seus métodos de contacto preferidos"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
+#: ../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:534
+#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707
+#: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
 msgstr "Vídeo conferencia"
 
-#: ../src/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Seu estado actual"
 
-#: ../src/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Servizos en liña"
 
-#: ../src/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Permitir que outros consulten que servizos está empregando"
 
-#: ../src/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Permitir que outros consulten qué ordenador está empregando"
 
-#: ../src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Seu ficheiro VCard"
 
-#: ../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 "Atributos do estado do usuario en liña"
 
-#: ../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 "
@@ -11371,167 +13234,168 @@
 "liña así como súa información persoal. Por favor, encha a información que "
 "desexa que outros usuarios vexan de vostede."
 
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1434
+#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "Mensaxe do día"
 
-#: ../src/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "Non hai dispoñible un mensaxe do día"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
+#: ../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 "Non hai unha mensaxe do día asociada con esta conexión"
 
-#: ../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 "Creando o novo par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:841
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "Fallou a xeneración de claves"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "Lonxitude da clave"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "Ficheiro de clave pública"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:951
+#: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../src/protocols/silc/silc.c:958
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "Xerar par de claves"
 
-#: ../src/protocols/silc/silc.c:1002
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "Estado en liña"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "Amosar mensaxe do sía"
 
-#: ../src/protocols/silc/silc.c:1015
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../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 "O usuario <I>%s</I> non está na rede"
 
-#: ../src/protocols/silc/silc.c:1305
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "Tópico demasiado longo"
 
-#: ../src/protocols/silc/silc.c:1386
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "Debe especificar un alcume"
 
-#: ../src/protocols/silc/silc.c:1488
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "non se atopou o canle %s"
 
-#: ../src/protocols/silc/silc.c:1493
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "os modos do canle de %s son: %s"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non se definiron modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1508
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Non se puideron fixar os modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1538
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Comando descoñecido: %s, (pode ser un erro de Gaim)"
 
-#: ../src/protocols/silc/silc.c:1601
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canle]:  Abandonar un chat"
 
-#: ../src/protocols/silc/silc.c:1605
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canle]:  Abandonar o chat"
 
-#: ../src/protocols/silc/silc.c:1609
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Ver ou trocar o tópico"
 
-#: ../src/protocols/silc/silc.c:1614
+#: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a un chat nesta rede"
 
-#: ../src/protocols/silc/silc.c:1618
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
 msgstr "list:  Amosar os canles nesta rede"
 
-#: ../src/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;alcume&gt;:  Ver información do alcume"
 
-#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
+#: ../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;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
 
-#: ../src/protocols/silc/silc.c:1630
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;alcume&gt; [&lt;mensaxe&gt;]:  Enviar unha mensaxe privada ao "
 "usuario"
 
-#: ../src/protocols/silc/silc.c:1634
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Amosar a mensaxe do día do servidor"
 
-#: ../src/protocols/silc/silc.c:1638
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: ../src/protocols/silc/silc.c:1642
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaxe]:  Desconecta do servidor actual opcionalmente indicando unha "
 "mensaxe"
 
-#: ../src/protocols/silc/silc.c:1646
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
 
-#: ../src/protocols/silc/silc.c:1652
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;alcume&gt; [-pubkey|&lt;razón&gt;]:  Matar un alcume"
 
-#: ../src/protocols/silc/silc.c:1656
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
 
-#: ../src/protocols/silc/silc.c:1660
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;alcume&gt;:  Amosar información do alcume"
 
-#: ../src/protocols/silc/silc.c:1664
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11539,7 +13403,7 @@
 "cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
 "modos do canle"
 
-#: ../src/protocols/silc/silc.c:1668
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11547,15 +13411,15 @@
 "cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alcume&gt;:  Cambio os modos do "
 "usuario ou do canle"
 
-#: ../src/protocols/silc/silc.c:1672
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuario&gt;:  Establecer seus modos na rede"
 
-#: ../src/protocols/silc/silc.c:1676
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;alcume&gt; [-pubkey]:  Obter privilexios de operador"
 
-#: ../src/protocols/silc/silc.c:1680
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11563,37 +13427,37 @@
 "invite &lt;canle&gt; [-|+]&lt;alcume&gt;:  invita un alcume ou engade/"
 "elimina o alcume da lista de invitados para o canle"
 
-#: ../src/protocols/silc/silc.c:1684
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
 
-#: ../src/protocols/silc/silc.c:1688
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos do servidor"
 
-#: ../src/protocols/silc/silc.c:1692
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canle&gt; +|-&lt;alcume&gt;]:  Vetar a un cliente do canle"
 
-#: ../src/protocols/silc/silc.c:1696
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;alcume|servidor&gt;:  Obtén a clave pública do servidor ou do "
 "cliente"
 
-#: ../src/protocols/silc/silc.c:1700
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Amosa as estatísticas do servidor e da rede"
 
-#: ../src/protocols/silc/silc.c:1704
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING ao servidor ao que está conectado"
 
-#: ../src/protocols/silc/silc.c:1709
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canle&gt;:  Obtén a lista dos usuarios que están no canle"
 
-#: ../src/protocols/silc/silc.c:1713
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11610,111 +13474,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1822
+#: ../libgaim/protocols/silc/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1824
+#: ../libgaim/protocols/silc/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de conferencia segura en vivo en Internet (SILC)"
 
-#: ../src/protocols/silc/silc.c:1861
+#: ../libgaim/protocols/silc/silc.c:1858
 msgid "Public Key file"
 msgstr "Ficheiro de clave pública"
 
-#: ../src/protocols/silc/silc.c:1865
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Private Key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:1875
+#: ../libgaim/protocols/silc/silc.c:1872
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../libgaim/protocols/silc/silc.c:1882
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1885
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../libgaim/protocols/silc/silc.c:1888
 msgid "Reject watching by other users"
 msgstr "Impedir que outros usuarios vexan"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../libgaim/protocols/silc/silc.c:1891
 msgid "Block invites"
 msgstr "Bloquear invitacións"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../libgaim/protocols/silc/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que non fagan un troco de claves"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../libgaim/protocols/silc/silc.c:1897
 msgid "Reject online status attribute requests"
 msgstr "Rexeitar solicitudes dos atributos do estado de liña"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../libgaim/protocols/silc/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensaxes ao encerado"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../libgaim/protocols/silc/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Abrir o encerado automaticamente"
 
-#: ../src/protocols/silc/silc.c:1909
+#: ../libgaim/protocols/silc/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Asinar dixitalmente todas as mensaxes instantáneas"
 
-#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creando o par de claves SILC..."
 
 #. 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:328
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../src/protocols/silc/util.c:330
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome de usuario :\t%s\n"
 
-#: ../src/protocols/silc/util.c:332
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do servidor: \t%s\n"
 
-#: ../src/protocols/silc/util.c:336
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: ../src/protocols/silc/util.c:338
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../src/protocols/silc/util.c:339
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../src/protocols/silc/util.c:340
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Lonxitude da clave: \t%d bits\n"
 
-#: ../src/protocols/silc/util.c:342
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11725,7 +13589,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:343
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11734,69 +13598,77 @@
 "Pegada babble da clave pública:\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Información de clave pública"
 
-#: ../src/protocols/silc/util.c:530
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../src/protocols/silc/util.c:536
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "Vídeo conferencia"
 
-#: ../src/protocols/silc/util.c:554
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../src/protocols/silc/util.c:558
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:560
+#: ../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 enviou unha mensaxe ao encerado. Quere abrir o encerado?"
 
-#: ../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 "
 "whiteboard?"
 msgstr "%s enviou unha mensaxe ao encerado da canle %s Quere abrir o encerado?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Encerado"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:411
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Non se puido escribir"
 
-#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "Non se puido conectar"
 
-#: ../src/protocols/simple/simple.c:997
+#: ../libgaim/protocols/simple/simple.c:1035
 msgid "Wrong Password"
 msgstr "Contrasinal erróneo"
 
-#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
-#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
+#: ../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 "Non se puido crear o socket para escoitar"
 
-#: ../src/protocols/simple/simple.c:1477
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "Non se puido resolver o servidor"
 
-#: ../src/protocols/simple/simple.c:1587
+#: ../libgaim/protocols/simple/simple.c:1630
+#, fuzzy
+msgid "Could not resolve hostname"
+msgstr "Non se puido resolver o servidor"
+
+#: ../libgaim/protocols/simple/simple.c:1647
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Os alcumes de SIP non poden ter espazos en branco nin o símbolo @"
 
@@ -11808,155 +13680,159 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1749
+#: ../libgaim/protocols/simple/simple.c:1815
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1750
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1772
+#: ../libgaim/protocols/simple/simple.c:1838
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estado público (nota: todos poderán velo)"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../libgaim/protocols/simple/simple.c:1844
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../src/protocols/simple/simple.c:1780
+#: ../libgaim/protocols/simple/simple.c:1846
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1782
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Fallou a conexión a %s"
 
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Non se puido escribir o ficheiro %s."
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Non se puido ler o ficheiro %s."
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaxe demasiado longa, os últimos %s bytes foron borrados."
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non está conectado agora."
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Non se permiten avisos de %s."
 
-#: ../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 mensaxe foi descartada, vostede está excedendo o límite de velocidade do "
 "servidor."
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Non está dispoñible o chat en %s."
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Está enviando mensaxes demasiado rápido a %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 "Perdeu un MI de %s porque era demasiado grade."
 
-#: ../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 "Perdeu un MI de %s porque foi mandado demasiado rápido."
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Fallo."
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Necesito máis calificadores."
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Servizo de directorio temporalmente non dispoñible."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "Busca de enderezos de correo electrónico restrinxida."
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Sen palabras clave."
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "O usuario non ten información no directorio."
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "País non soportado."
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo descoñecido: %s."
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Nome de conta ou contrasinal incorrecto."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Servizo temporalmente non dispoñible."
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Seu nivel de advertencias é demasiado alto para conectarse."
 
-#: ../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."
@@ -11964,41 +13840,41 @@
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
 "de novo. Se segue intentándoo, necesitará agardar incluso máis tempo."
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ocorreu un erro descoñecido ao conectarse: %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 "Un erro descoñecido, %d, ocorreu. Info: %s"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nome de grupo inválido"
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conexión pechada"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Agardando resposta..."
 
-#: ../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 rematou súa pausa. Xa pode volver a mandar mensaxes."
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "O contrasinal cambiouse con éxito"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC enviou un comando PAUSA."
 
-#: ../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 "
@@ -12008,52 +13884,52 @@
 "expulsarlle se envía mensaxes. Gaim evitará que lle chegue calquer cousa. "
 "Isto é só temporal, por favor, sexa pacente."
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Obter información do directorio"
 
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Establecer información do directorio"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Cambiar o contrasinal"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Non se puido abrir %s para escritura!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Fallou a transferencia do ficheiro; posiblemente foi cancelado polo outro "
 "extremo."
 
-#: ../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 "Non se puido conectar para realizar a transferencia."
 
-#: ../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 ""
 "Non se puido escribir a cabeceira de ficheiro. O ficheiro non será "
 "transferido."
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Gardar como..."
 
-#: ../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 solicita %s para aceptar %d ficheiro: %s (%.2f %s)%s%s"
 msgstr[1] "%s solicita %s para aceptar %d ficheiros: %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 solicítalle que lle mande un ficheiro"
@@ -12068,19 +13944,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 "Complemento de protocolo TOC"
 
-#: ../src/protocols/yahoo/yahoo.c:710
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Súa mensaxe Yahoo! non se enviou."
 
-#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:809
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
@@ -12088,23 +13965,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:905
+#: ../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 "O usuario %s quere engadir a %s a súa lista de amigos %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:911
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Mensaxe (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:953
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuario %s rechazou súa solicitude de engadilo a súa lista de amigos (de "
 "forma retroactiva)."
 
-#: ../src/protocols/yahoo/yahoo.c:956
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12113,11 +13990,11 @@
 "O usuario %s negou (de forma retroactiva) súa solicitude de engadilo a súa "
 "lista de amigos pola seguinte razón: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Rechazouse a adición do amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1702
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12128,11 +14005,11 @@
 "Esta versión de Gaim posiblemente non sexa capaz de conectarse a Yahoo. "
 "Comprobe %s para obter unha actualización."
 
-#: ../src/protocols/yahoo/yahoo.c:1705
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1771
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12141,19 +14018,19 @@
 "Intentou ignorar a %s, pero o usuario está na súa lista de amigos. Se "
 "selecciona \"Si\" eliminaráselle e ignorarase a este amigo."
 
-#: ../src/protocols/yahoo/yahoo.c:1774
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1808
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Nome de usuario inválido."
 
-#: ../src/protocols/yahoo/yahoo.c:1819
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticación habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../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 "
@@ -12165,138 +14042,145 @@
 "cambiou. Gaim tentará conectarse a través da autenticación de Mensaxería web "
 "que poderá dar lugar a un acceso a menos funcionalidades e funcións."
 
-#: ../src/protocols/yahoo/yahoo.c:1828
-msgid "Incorrect password."
-msgstr "Contrasinal incorrecto."
-
-#: ../src/protocols/yahoo/yahoo.c:1831
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Súa conta está bloqueada. Por favor, conéctese ao servidor de web de Yahoo!."
 
-#: ../src/protocols/yahoo/yahoo.c:1834
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro descoñecido número %d. Se se conecta ao servidor de web de Yahoo! é "
 "posible que isto arrégrese."
 
-#: ../src/protocols/yahoo/yahoo.c:1888
+#: ../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 ""
 "Non se puido engadir ao amigo %s ao grupo %s da lista no servidor para a "
 "conta %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1891
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o amigo á lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2010
+#: ../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:2149 ../src/protocols/yahoo/yahoo.c:2296
-#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Non se puido ler"
-
-#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
-#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+#, fuzzy
+msgid "Received unexpected HTTP response from server."
+msgstr "Resposta inválida do servidor."
+
+#: ../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 "Problema de conexión"
 
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Fora da casa"
 
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Lexos do escritorio"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Fora da oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "Non está na lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2885
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2928
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2937
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2985
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2991
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../src/protocols/yahoo/yahoo.c:3019
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Configuración do entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:3025
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Iniciar Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3057
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:3066
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Xuntarse con quen nun chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3076
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Xuntarse cun usuario nun chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3623
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede de Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3628
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Amosar as canles da rede Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3632
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para chamar súa atención"
 
-#: ../src/protocols/yahoo/yahoo.c:3636
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
@@ -12310,150 +14194,222 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3748
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../src/protocols/yahoo/yahoo.c:3751
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
 #, fuzzy
 msgid "Pager server"
 msgstr "Servidor de conexión"
 
-#: ../src/protocols/yahoo/yahoo.c:3754
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
 #, fuzzy
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3760
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3763
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3766
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3769
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Ubicación da sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3772
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar as invitacións a salas de conferencias ou chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3776
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3779
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3782
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
 msgid "Yahoo Chat port"
 msgstr "Porto de chat de Yahoo"
 
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declinou súa invitación de conferencia na sala \"%s\" porque \"%s\"."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Invitación rexeitada"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Non se puido unir ao chat"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Sala descoñecida"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Quizais a sala está chea"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Non dispoñible"
+
+#: ../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 ""
+"Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
+"antes de poder unirse á sala do chat"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Agora está conversando en %s."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Non se puido unir ao amigo ao chat"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Quizais non están nun chat?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Non se puido obter a lista de salas."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Voces"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Cámaras web"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Non se puido obter a lista de salas."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Salas de usuarios"
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."
 
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+#: ../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 "Non se puido establecer o descritor de ficheiro."
 
 #. 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 "Erro de escritura"
 
-#: ../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>Enderezo IP:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! xaponés"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../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."
 msgstr "Síntoo, os perfiles con contido só para adultos non están soportados aínda."
 
-#: ../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"
 msgstr "Se desexa ver este perfil, debería visitar este ligazón co seu navegador web"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Aficións"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Páxina persoal"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Ligazón interesante 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Ligazón interesante 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Ligazón interesante 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s non dispoñible"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
+#: ../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."
 msgstr "Síntoo, este perfil parece estar nun idioma ou formato aínda non soportado."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
+#: ../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."
@@ -12461,7 +14417,7 @@
 "Non se puido obter o perfil do usuario. Isto é usualmente un problema "
 "temporal no lado do servidor. Por favor, probe de novo máis tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
+#: ../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 "
@@ -12471,86 +14427,22 @@
 "usuario non existe. Nembargantes, a vece Yahoo! faia ao buscar un perfil de "
 "usuario. Se está seguro de que o usuario existe inténteo de novo máis tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario está baleiro."
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declinou súa invitación de conferencia na sala \"%s\" porque \"%s\"."
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invitación rexeitada"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Non se puido unir ao chat"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Sala descoñecida"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Quizais a sala está chea"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Non dispoñible"
-
-#: ../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 ""
-"Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
-"antes de poder unirse á sala do chat"
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Agora está conversando en %s."
-
-#: ../src/protocols/yahoo/yahoochat.c:626
-msgid "Failed to join buddy in chat"
-msgstr "Non se puido unir ao amigo ao chat"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Maybe they're not in a chat?"
-msgstr "Quizais non están nun chat?"
-
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Fetching the room list failed."
-msgstr "Non se puido obter a lista de salas."
-
-#: ../src/protocols/yahoo/yahoochat.c:1433
-msgid "Voices"
-msgstr "Voces"
-
-#: ../src/protocols/yahoo/yahoochat.c:1436
-msgid "Webcams"
-msgstr "Cámaras web"
-
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
-msgid "Unable to fetch room list."
-msgstr "Non se puido obter a lista de salas."
-
-#: ../src/protocols/yahoo/yahoochat.c:1510
-msgid "User Rooms"
-msgstr "Salas de usuarios"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
 
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr "Non conectado ao servidor."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12558,79 +14450,83 @@
 "(Houbo un erro convertindo esta mensaxe.\tComprobe a opción de "
 "'Codificación' no Editor de contas)"
 
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar ao chat %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Agochado ou non conectado"
 
-#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fallou o intento de suscrición a %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a un novo "
 "chat"
 
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../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;"
@@ -12638,7 +14534,7 @@
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../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;"
@@ -12646,7 +14542,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../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;"
@@ -12654,15 +14550,15 @@
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Obter as suscricións do servidor"
 
@@ -12676,78 +14572,101 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2896
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
 msgstr "Usar tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2899
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2902
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2914
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Reino"
 
-#: ../src/protocols/zephyr/zephyr.c:2917
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
-#: ../src/proxy.c:1348
-#, c-format
-msgid "Proxy connection error %d"
+#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
+#, fuzzy, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr "Non se puido crear o socket"
+
+#: ../libgaim/proxy.c:644
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Non se puido establecer o rol \"%s\" para o usuario: %s"
+
+#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
+#, fuzzy, c-format
+msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexión no proxy %d"
 
-#. Forbidden
-#: ../src/proxy.c:1337
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
+#: ../libgaim/proxy.c:764
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Acceso denegado: o servidor proxy non permite túneles no porto %d."
 
+#: ../libgaim/proxy.c:984
+#, fuzzy, c-format
+msgid "Error resolving %s"
+msgstr "Erro executando %s"
+
+#: ../libgaim/proxy.c:1673
+#, fuzzy
+msgid "Could not resolve host name"
+msgstr "Non se puido resolver o servidor"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
+#: ../libgaim/request.h:1354
 msgid "_Accept"
 msgstr "_Aceptar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:45
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Non estou aquí agora"
 
-#: ../src/savedstatuses.c:524
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "estados gardados"
 
-#: ../src/server.c:227
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s agora se chama %s.\n"
 
-#: ../src/server.c:681
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12756,73 +14675,73 @@
 "%s invitou a %s á sala de chat %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 invitou a %s á sala de chat %s\n"
 
-#: ../src/server.c:690
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Aceptar a invitación de chat?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Desestablecer"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "Non dispoñible"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../src/status.c:622
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s cambiou o estado de %s a %s"
 
-#: ../src/status.c:632
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s chámase agora %s"
 
-#: ../src/status.c:637
+#: ../libgaim/status.c:626
 #, fuzzy, c-format
 msgid "%s is no longer %s"
 msgstr "%s xa non está inactivo."
 
-#: ../src/status.c:1311
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora está inactivo"
 
-#: ../src/status.c:1328
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora está activo"
 
-#: ../src/status.c:1394
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s agora está inactivo"
 
-#: ../src/status.c:1396
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s agora está activo"
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2453
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro lendo %s"
 
-#: ../src/util.c:2454
+#: ../libgaim/util.c:2430
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12831,57 +14750,82 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../src/util.c:2903
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../src/util.c:2906
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../src/util.c:2932
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../src/util.c:2944
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../src/util.c:2958
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../src/util.c:2972
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/util.c:3439
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Erro abrindo a conexión.\n"
-
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, fuzzy, c-format
+msgid "Unable to connect to %s"
+msgstr "Non se puido conectar ao servidor"
+
+#: ../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 ""
+
+#: ../libgaim/util.c:3324
+#, fuzzy, c-format
+msgid "Error reading from %s: %s"
+msgstr "Erro ao ler do socket: %s"
+
+#: ../libgaim/util.c:3355
+#, fuzzy, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+"Erro escribindo %s:\n"
+"%s.\n"
+
+#: ../libgaim/util.c:3380
+#, fuzzy, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Non se puido conectar ao servidor"
+
--- a/po/sl.po	Fri Nov 10 05:18:10 2006 +0000
+++ b/po/sl.po	Fri Nov 10 06:23:10 2006 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2006-06-08 19:57+0100\n"
+"PO-Revision-Date: 2006-11-04 11:08+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,823 +32,1245 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Pošlji neposredna sporočila prek več protokolov"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Preizkusi šifre"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267
-#: ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Preizkusi šifre, ki jih prejmete z Gaimom."
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Prijatelj je nedejaven"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Prijatelj je odsoten"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Prijatelj je \"podaljšano\" odsoten"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Prijatelj je mobilen"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Prijatelj ni na zvezi"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Vrednosti točk, ko ..."
-
-#: ../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 "Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Uporabi zadnjega prijatelja, ko so rezultati poravnani"
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Vrednosti točk za račun ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Prednost stika"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
-
-#. *< 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 "Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
-
-#. *< 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 "Vstavek za vzpostavitev seje Crazychat."
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "Z Gaimom pridobi prijateljev ips za povezavo v sejo Crazychat"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Nastavitve omrežja"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "Vrata TCP"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "Vrata UDP"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Kalibracija možnosti"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345
-#: ../src/gtkaccount.c:2262
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Omogočen"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Onemogočen"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:152
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:155
-#: ../plugins/dbus-example.c:157
-msgid "DBus Plugin Example"
-msgstr "Primer vstavka DBus"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
-
-#: ../plugins/docklet/docklet.c:157
-#: ../src/gtkblist.c:3241
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d neprebranih sporočil od %s\n"
-msgstr[1] "%d neprebrano sporočilo od %s\n"
-msgstr[2] "%d neprebrani sporočili od %s\n"
-msgstr[3] "%d neprebrana sporočila od %s\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Spremeni stanje"
-
-#: ../plugins/docklet/docklet.c:435
-#: ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996
-#: ../src/protocols/jabber/buddy.c:1363
-#: ../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:2843
-#: ../src/protocols/yahoo/yahoo.c:2731
-#: ../src/status.c:155
-msgid "Available"
-msgstr "Na voljo"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439
-#: ../src/gtkprefs.c:1774
-#: ../src/gtkstatusbox.c:674
-#: ../src/protocols/gg/gg.c:999
-#: ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1367
-#: ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719
-#: ../src/protocols/oscar/oscar.c:4397
-#: ../src/protocols/oscar/oscar.c:5440
-#: ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3185
-#: ../src/protocols/yahoo/yahoo.c:3258
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Odsoten"
-
-#: ../plugins/docklet/docklet.c:443
-#: ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723
-#: ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Neviden"
-
-#: ../plugins/docklet/docklet.c:447
-#: ../src/gtkblist.c:2971
-#: ../src/gtkstatusbox.c:676
-#: ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1361
-#: ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:5412
-#: ../src/protocols/yahoo/yahoo.c:2729
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "Brez povezave"
-
-#: ../plugins/docklet/docklet.c:467
-#: ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Novo ..."
-
-#: ../plugins/docklet/docklet.c:468
-#: ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Datoteka shranjena ..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Pokaži seznam prijateljev"
-
-#: ../plugins/docklet/docklet.c:489
-#: ../src/gtkconv.c:5680
-msgid "Unread Messages"
-msgstr "Neprebrana sporočila"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Novo sporočilo ..."
-
-#: ../plugins/docklet/docklet.c:519
-#: ../src/gtkaccount.c:2478
+#: ../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 "Napaka"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Račun ni bil dodan"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Pojavno ime računa ne sme biti prazno."
+
+#: ../console/gntaccount.c:423
+#: ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "Obveščanje o prispeli pošti"
+
+#: ../console/gntaccount.c:433
+#: ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Zapomni si geslo"
+
+#: ../console/gntaccount.c:474
+#: ../gtk/gtkaccount.c:1400
+#: ../gtk/gtkblist.c:3797
+msgid "Modify Account"
+msgstr "Spremeni račun"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Nov račun"
+
+#: ../console/gntaccount.c:500
+#: ../gtk/gtkaccount.c:399
+#: ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../console/gntaccount.c:508
+#: ../gtk/gtkaccount.c:404
+#: ../gtk/gtkblist.c:4942
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Zaslonsko ime:"
+
+#: ../console/gntaccount.c:521
+#: ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Geslo:"
+
+#: ../console/gntaccount.c:531
+#: ../gtk/gtkblist.c:4963
+#: ../gtk/gtkblist.c:5328
+msgid "Alias:"
+msgstr "Psevdonim:"
+
+#. 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:1388
+#: ../libgaim/protocols/oscar/oscar.c:2152
+#: ../libgaim/protocols/oscar/oscar.c:2191
+#: ../libgaim/protocols/oscar/oscar.c:2239
+#: ../libgaim/protocols/oscar/oscar.c:5733
+#: ../libgaim/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5962
+#: ../libgaim/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/oscar/oscar.c:6087
+#: ../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 "Prekliči"
+
+#. 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 "Shrani"
+
+#: ../console/gntaccount.c:610
+#: ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Ste prepričani, da želite izbrisati %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Izbriši račun"
+
+#: ../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 "Zbriši"
+
+#: ../console/gntaccount.c:644
+#: ../console/gntblist.c:1841
+#: ../console/gntui.c:70
+#: ../gtk/gtkaccount.c:2139
+#: ../gtk/gtkdocklet.c:530
 msgid "Accounts"
 msgstr "Računi"
 
-#: ../plugins/docklet/docklet.c:520
-#: ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Vstavki"
-
-#: ../plugins/docklet/docklet.c:521
-#: ../src/gtkprefs.c:1915
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Utišaj zvoke"
-
-#. 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 "Končaj"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Utripaj ikono na pladnju za neprebrano ..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "_Neposredna sporočila:"
-
-#: ../plugins/docklet/docklet.c:684
-#: ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:462
-#: ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1764
-#: ../src/gtkprefs.c:1778
-msgid "Never"
-msgstr "nikoli"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "V skritih pogovorih"
-
-#: ../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:463
-#: ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "vedno"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "_Sporočila klepeta:"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Ko je vzdevek v sporočilu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Ikona na pladnju"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Prikaže ikono za Gaim v sistemskem pladnju."
-
-#. *  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 "Prikaže ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogoča lažji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prikaže seznam stikov ali prijavni zaslon. Omogoča tudi možnosti utripanja ob neprebranih sporočilih."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Postavitev"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "Postavitev pladnja."
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Po številu pomenkov"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Postavitev pomenkov"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Število pomenkov v oknu"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Pri postavitvi po številu loči okna za klepet in zasebni pomenek"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "Postavitev"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Dodatne možnosti postavitve pomenka."
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in zasebni pomenek"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Nadzor datotek Gaim"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251
-#: ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Omogoča nadzor nad Gaimom z vnašanjem ukazov v datoteko."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim predstavitveni vstavek"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Vzorčni vstavek, ki počne razne stvari - oglejte si opis."
-
-#. *  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 ""
-"To je resnično carski vstavek, ki naredi dosti stvari:\n"
-"- ko se prijavite, pove kdo je napisal ta program;\n"
-"- prikaže vsa prispela sporočila črkovana nazaj;\n"
-"- pošlje sporočilo prijateljem na vašem seznamu, takoj ko se prijavijo;"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Barva kazalke"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Drugotna barva kazalke"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Barva povezave"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Velikost razširnika GtkTreeView"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "Vodoravno ločilo GtkTreeView"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Vnos pogovora"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Zgodovina pogovora"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Ogledovalnik dnevnika"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Pogovorno okno zahteve"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Pogovorno okno obvestila"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Razširniki zamika GtkTreeView"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Nastavite barvo za %s"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Nastavite barvo"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Nastavite pisavo za %s"
-
-#: ../plugins/gaimrc.c:364
-msgid "Select Interface Font"
-msgstr "Nastavite pisavo vmesnika"
-
-#: ../plugins/gaimrc.c:420
-msgid "General"
-msgstr "Splošno"
-
-#: ../plugins/gaimrc.c:425
-msgid "GTK+ Interface Font"
-msgstr "Pisava vmesnika GTK+"
-
-#: ../plugins/gaimrc.c:445
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Tema bližnjic besedila GTK+"
-
-#: ../plugins/gaimrc.c:480
-msgid "Interface colors"
-msgstr "Barve vmesnika"
-
-#: ../plugins/gaimrc.c:504
-msgid "Widget Sizes"
-msgstr "Velikosti gradnikov"
-
-#: ../plugins/gaimrc.c:525
-msgid "Fonts"
-msgstr "Pisave"
-
-#: ../plugins/gaimrc.c:548
-msgid "Tools"
-msgstr "Orodja"
-
-#: ../plugins/gaimrc.c:553
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:561
-msgid "Re-read gtkrc files"
-msgstr "Ponovno preberi datoteke gtkrc"
-
-#: ../plugins/gaimrc.c:588
-msgid "Gaim GTK+ Theme Control"
-msgstr "Nadzor teme Gaim GTK+"
-
-#: ../plugins/gaimrc.c:590
-#: ../plugins/gaimrc.c:591
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Nastavitve gest miške"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Srednja miškina tipka"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Desna miškina tipka"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Viden prikaz gest"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Miškine geste"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Omogoča podporo za geste miške"
-
-#. *  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 ""
-"Omogoča podporo za geste miške v pogovornih oknih.\n"
-"Povlecite s srednjo miškino tipko, da storite naslednje:\n"
-"\n"
-"Povlecite navzdol in zatem desno, da končate pogovor.\n"
-"Povlecite navzgor in zatem levo, da se vrnete k prejšnjemu pogovoru.\n"
-"Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
+#: ../console/gntaccount.c:650
+#, fuzzy
+msgid "You can enable/disable accounts from the following list."
+msgstr "Pričakujete pooblastila od naslednjih prijateljev"
+
+#: ../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:2430
+#: ../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 "Dodaj"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Spremeni"
+
+#: ../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 je nastavil %s za svojega prijatelja%s%s"
+
+#: ../console/gntaccount.c:831
+#: ../gtk/gtkaccount.c:2304
+msgid "Add buddy to your list?"
+msgstr "Želite dodati prijatelja na seznam?"
+
+#: ../console/gntblist.c:269
+msgid "You must provide a screename for the buddy."
+msgstr "Za prijatelja morate vnesti pojavno ime."
+
+#: ../console/gntblist.c:271
+msgid "You must provide a group."
+msgstr "Vnesti morate skupino."
+
+#: ../console/gntblist.c:273
+msgid "You must select an account."
+msgstr "Izberite račun."
+
+#: ../console/gntblist.c:277
+msgid "Error adding buddy"
+msgstr "Napaka pri dodajanju prijatelja"
+
+#: ../console/gntblist.c:302
+#: ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893
+#: ../libgaim/protocols/oscar/oscar.c:2804
+msgid "Screen Name"
+msgstr "Ime"
+
+#: ../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 "Psevdonim"
+
+#: ../console/gntblist.c:308
+#: ../console/gntblist.c:380
+#, fuzzy
+msgid "Group"
+msgstr "~Združi po"
+
+#: ../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 "Račun"
+
+#: ../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 "Dodaj prijatelja"
+
+#: ../console/gntblist.c:317
+msgid "Please enter buddy information."
+msgstr "Prosimo, vnesite podatke o prijatelju."
+
+#: ../console/gntblist.c:340
+#: ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "Pomenki"
 
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../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:759
-#: ../src/protocols/msn/msn.c:1527
-#: ../src/protocols/msn/msn.c:1580
-#: ../src/protocols/msn/msn.c:1601
+#: ../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 "Ime"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Neposredno sporočanje"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:442
-#: ../src/gtkblist.c:4530
-#: ../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:2974
-msgid "Add Buddy"
-msgstr "Dodaj prijatelja"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:455
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Izberite osebo iz vašega imenika spodaj ali dodajte novo."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:468
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1720
-#: ../src/protocols/oscar/oscar.c:6020
-#: ../src/protocols/sametime/sametime.c:5524
-msgid "Search"
-msgstr "Išči"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307
-#: ../src/gtkblist.c:4614
-#: ../src/gtkblist.c:4978
-msgid "Group:"
-msgstr "Skupina:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:575
-#: ../plugins/gevolution/assoc-buddy.c:464
-#: ../plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Nova oseba"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:592
-msgid "Select Buddy"
-msgstr "Izberi prijatelja"
-
-#. 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 "Izberite osebo iz vašega imenika, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "Podrobnosti _o uporabniku"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "Pridruži prijatelj_a"
-
-#: ../plugins/gevolution/eds-utils.c:73
-#: ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1125
-msgid "None"
-msgstr "brez"
-
-#: ../plugins/gevolution/gevo-util.c:64
-#: ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516
-#: ../src/blist.c:1278
-#: ../src/blist.c:1505
-#: ../src/gtkblist.c:4423
-#: ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Prijatelji"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "E-sporočila ni mogoče poslati."
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "Izvršilne datoteke Evolution ni v POTI."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "Navedenega prijatelja ni med stiki v Evolution."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Dodaj v imenik"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Pošlji e-sporočilo"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Nastavitve integracije z Evolutionom"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
-
-#: ../plugins/gevolution/gevolution.c:450
-#: ../plugins/idle.c:150
-#: ../plugins/idle.c:186
-#: ../src/gtknotify.c:399
-#: ../src/gtkpounce.c:1244
-msgid "Account"
-msgstr "Račun"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Integracija z Evolutionom"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Omogoča integracijo z Evolutionom."
-
-#: ../plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Spodaj vnesite podatke o osebi."
-
-#: ../plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Spodaj vnesite prijateljev vzdevek in vrsto računa."
-
-#: ../plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Vrsta računa:"
-
-#: ../plugins/gevolution/new_person_dialog.c:295
-#: ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4576
-msgid "Screen name:"
-msgstr "Zaslonsko ime:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Dodatne informacije:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:338
-#: ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446
-#: ../src/protocols/oscar/oscar.c:625
-msgid "Buddy Icon"
-msgstr "Ikona prijatelja"
-
-#: ../plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Ime:"
-
-#: ../plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Priimek:"
-
-#: ../plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-pošta:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "Preskus signalov GTK"
-
-#. *< 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 "Preveri pravilnost delovanja vseh signalov uporabniškega vmesnika."
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:383
+#: ../console/gntblist.c:796
+#: ../gtk/gtkblist.c:5274
+msgid "Add Chat"
+msgstr "Dodaj pomenek"
+
+#: ../console/gntblist.c:384
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../console/gntblist.c:395
+#: ../console/gntblist.c:408
+msgid "Error adding group"
+msgstr "Napaka pri dodajanju skupine"
+
+#: ../console/gntblist.c:396
+msgid "You must give a name for the group to add."
+msgstr "Vnesti morate ime skupine, ki jo želite dodati."
+
+#: ../console/gntblist.c:409
+msgid "A group with the name already exists."
+msgstr "Skupina s tem imenom že obstaja."
+
+#: ../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 "Dodaj skupino"
+
+#: ../console/gntblist.c:416
+msgid "Enter the name of the group"
+msgstr "Vnesite ime skupine"
+
+#: ../console/gntblist.c:746
+msgid "Edit Chat"
+msgstr "Uredi pomenek"
+
+#: ../console/gntblist.c:746
+msgid "Please Update the necessary fields."
+msgstr "Prosimo, posodobite potrebna polja."
+
+#: ../console/gntblist.c:747
+#: ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "Uredi"
+
+#: ../console/gntblist.c:761
+msgid "Auto-join"
+msgstr "Samodejno spoji"
+
+#: ../console/gntblist.c:770
+msgid "Edit Settings"
+msgstr "Uredi nastavitve"
+
+#: ../console/gntblist.c:816
+#: ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Informacije"
+
+#: ../console/gntblist.c:821
+#, fuzzy
+msgid "Add Buddy Pounce"
+msgstr "Dodaj vsa polja"
+
+#: ../console/gntblist.c:828
+#: ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Pošlji datoteko"
+
+#: ../console/gntblist.c:832
+msgid "View Log"
+msgstr "Pokaži dnevnik"
+
+#: ../console/gntblist.c:912
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Prosimo, vnesite novo ime za %s"
+
+#: ../console/gntblist.c:914
+#: ../console/gntblist.c:915
+#: ../console/gntblist.c:1084
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: ../console/gntblist.c:914
+msgid "Enter empty string to reset the name."
+msgstr "Vnesite prazen niz da ponastavite ime."
+
+#: ../console/gntblist.c:987
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+#: ../console/gntblist.c:995
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#: ../console/gntblist.c:1000
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Ste prepričani, da želite odstraniti %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:1003
+msgid "Confirm Remove"
+msgstr "Potrditev odstranitve"
+
+#: ../console/gntblist.c:1006
+#: ../console/gntblist.c:1086
+#: ../gtk/gtkblist.c:1039
+#: ../gtk/gtkconv.c:1631
+#: ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Odstrani"
+
+#. 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 "Seznam prijateljev"
+
+#: ../console/gntblist.c:1090
+#, fuzzy
+msgid "Place tagged"
+msgstr "Dosedanji kraji bivanja"
+
+#: ../console/gntblist.c:1093
+msgid "Tag"
+msgstr ""
+
+#: ../console/gntblist.c:1120
+#: ../console/gntblist.c:1221
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Račun: %s (%s)"
+
+#: ../console/gntblist.c:1145
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Nedejaven: %s"
+
+#: ../console/gntblist.c:1200
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Vzdevek: %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"
+"Zadnjič viden: pred %s leti"
+
+#: ../console/gntblist.c:1456
+#: ../gtk/gtkdocklet.c:478
+#: ../gtk/gtkstatusbox.c:984
+msgid "New..."
+msgstr "Novo ..."
+
+#: ../console/gntblist.c:1463
+#: ../gtk/gtkdocklet.c:479
+#: ../gtk/gtkstatusbox.c:985
+msgid "Saved..."
+msgstr "Datoteka shranjena ..."
+
+#: ../console/gntblist.c:1809
+#: ../console/gntplugin.c:231
+#: ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:531
+#: ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Vstavki"
+
+#: ../console/gntblist.c:1901
+#: ../gtk/gtkdialogs.c:662
+#: ../gtk/gtkdialogs.c:799
+#: ../gtk/gtkdialogs.c:879
+msgid "_Name"
+msgstr "_Ime"
+
+#: ../console/gntblist.c:1906
+#: ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804
+#: ../gtk/gtkdialogs.c:884
+msgid "_Account"
+msgstr "_Račun"
+
+#: ../console/gntblist.c:1914
+#: ../gtk/gtkdialogs.c:675
+msgid "New Instant Message"
+msgstr "Novo neposredno sporočilo"
+
+#: ../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 "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
+
+#. *
+#. * 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:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../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 "V redu"
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1938
+#: ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Možnosti"
+
+#: ../console/gntblist.c:1944
+msgid "Send IM..."
+msgstr "Pošllji sporočilo ..."
+
+#: ../console/gntblist.c:1948
+#, fuzzy
+msgid "Toggle offline buddies"
+msgstr "Pokaži dnevniško datoteko"
+
+#: ../console/gntblist.c:1952
+msgid "Sort by status"
+msgstr "Razvrsti po stanju"
+
+#: ../console/gntblist.c:1956
+msgid "Sort alphabetically"
+msgstr "Razvrsti po abecedi"
+
+#: ../console/gntblist.c:1960
+msgid "Sort by log size"
+msgstr "Razvrsti po obsegu dnevnika"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s se je odjavil."
+
+#: ../console/gntconn.c:40
+#, fuzzy, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"Uporabnik %s želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
+"%s"
+
+#: ../console/gntconn.c:43
+#: ../gtk/gtkblist.c:3794
+#: ../libgaim/account.c:991
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "Napaka na povezavi"
+
+#: ../console/gntconv.c:71
+msgid "No such command."
+msgstr "Ta ukaz ne obstaja."
+
+#: ../console/gntconv.c:75
+#: ../gtk/gtkconv.c:493
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
+
+#: ../console/gntconv.c:80
+#: ../gtk/gtkconv.c:498
+msgid "Your command failed for an unknown reason."
+msgstr "Vaš ukaz iz neznanega razloga ni uspel."
+
+#: ../console/gntconv.c:85
+#: ../gtk/gtkconv.c:504
+msgid "That command only works in chats, not IMs."
+msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
+
+#: ../console/gntconv.c:88
+#: ../gtk/gtkconv.c:507
+msgid "That command only works in IMs, not chats."
+msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
+
+#: ../console/gntconv.c:92
+#: ../gtk/gtkconv.c:511
+msgid "That command doesn't work on this protocol."
+msgstr "Ta ukaz ne deluje na tem protokolu."
+
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Ukazi trenutno še niso podprti. Sporočilo NI bilo poslano."
+
+#: ../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
+#, fuzzy
+msgid "<AUTO-REPLY> "
+msgstr "Samodejna ~vrednost"
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:443
+msgid "List of users:\n"
+msgstr "Seznam uporabnikov:\n"
+
+#: ../console/gntconv.c:567
+#: ../gtk/gtkconv.c:386
+msgid "Supported debug options are:  version"
+msgstr "Podprte možnosti razhroščevanja:  različica"
+
+#: ../console/gntconv.c:602
+#: ../gtk/gtkconv.c:422
+msgid "No such command (in this context)."
+msgstr "Tak ukaz ne obstaja (v tem sklopu)."
+
+#: ../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 ""
+"Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
+"V tem sklopu so na voljo naslednji ukazi:\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;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
+
+#: ../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;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
+
+#: ../console/gntconv.c:650
+#: ../gtk/gtkconv.c:6738
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
+
+#: ../console/gntconv.c:653
+#: ../gtk/gtkconv.c:6741
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Počisti izpisane replike pomenka."
+
+#: ../console/gntconv.c:656
+#: ../gtk/gtkconv.c:6744
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
+
+#: ../console/gntconv.c:661
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+#: ../console/gntconv.c:664
+#, fuzzy
+msgid "buddylist: Show the buddylist."
+msgstr "Pokaži logotip"
+
+#: ../console/gntconv.c:667
+#, fuzzy
+msgid "accounts: Show the accounts window."
+msgstr "Dodaj okno tabele"
+
+#: ../console/gntconv.c:670
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Pokaži okno razhroščevanja."
+
+#: ../console/gntconv.c:673
+msgid "prefs: Show the preference window."
+msgstr ""
+
+#: ../console/gntconv.c:676
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+#: ../console/gntdebug.c:214
+#: ../console/gntui.c:72
+#: ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Razhroščevalno okno"
+
+#. 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 "Počisti"
+
+#: ../console/gntdebug.c:240
+#: ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Premor"
+
+#: ../console/gntdebug.c:245
+#: ../gtk/gtkdebug.c:783
+#: ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Prikaži čas"
+
+#: ../console/gntgaim.c:166
+#, fuzzy, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "Podatki za naslovno stran"
+
+#: ../console/gntgaim.c:168
+#, fuzzy, 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 ""
+"Gaim %s\n"
+"Uporaba: %s [MOŽNOST]...\n"
+"\n"
+"  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
+"  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
+"  -h, --help          izpiši to pomoč in končaj program\n"
+"  -n, --nologin       brez samodejne prijave\n"
+"  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
+"                     določa račun(e) za prijavo, ločene z vejico)\n"
+"  -v, --version       izpiši trenutno različico in končaj program\n"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "E-naslovi"
+
+#: ../console/gntnotify.c:152
+#: ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "Dobili ste pošto!"
+
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1138
+msgid "From"
+msgstr "Od"
+
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Zadeva"
+
+#: ../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 "Zapri"
+
+#: ../console/gntnotify.c:182
+#, fuzzy, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "~Nov naslov pošiljatelja:"
+msgstr[1] "%s ima %d novo sporočilo."
+msgstr[2] "%s ima %d novi sporočili."
+msgstr[3] "%s ima %d nova sporočila."
+
+#: ../console/gntnotify.c:206
+#: ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Nova e-pošta"
+
+#: ../console/gntnotify.c:229
+#: ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2611
+#, c-format
+msgid "Info for %s"
+msgstr "Podatki za %s"
+
+#: ../console/gntnotify.c:230
+#: ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Informacije o prijatelju"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Nadaljuj"
+
+#: ../console/gntnotify.c:309
+#: ../gtk/gtkconv.c:1610
+#: ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Informacije"
+
+#: ../console/gntnotify.c:312
+#: ../gtk/gtkconv.c:1571
+msgid "IM"
+msgstr "Sporoči"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Pridruži se"
+
+#: ../console/gntnotify.c:318
+#: ../libgaim/protocols/sametime/sametime.c:3445
+msgid "Invite"
+msgstr "Povabi"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(brez)"
+
+#: ../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 ""
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr "Še vedno je potrebno nekaj storiti glede tega."
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "Za ta vtičnik ni nobenih nastavitev."
+
+#: ../console/gntplugin.c:236
+#, fuzzy
+msgid "You can (un)load plugins from the following list."
+msgstr "Pričakujete pooblastila od naslednjih prijateljev"
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Prilagodi vstavek"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "Pokaži čas nedejavnosti"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "Pokaži neprijavljene prijatelje"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Pokaži časovne žige"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "Obvesti prijatelje, ko pišem"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "Oblika dnevnika"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "Beleži IM"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "Beleži klepete"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "Beleži spremembe stanja"
+
+#. Conversations
+#: ../console/gntprefs.c:220
+#: ../gtk/gtkprefs.c:898
+#: ../gtk/gtkprefs.c:1913
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "Pogovori"
+
+#: ../console/gntprefs.c:221
+#: ../gtk/gtkprefs.c:1349
+#: ../gtk/gtkprefs.c:1924
+msgid "Logging"
+msgstr "Beleženje v dnevnik"
+
+#: ../console/gntprefs.c:223
+#: ../console/gntui.c:74
+#: ../gtk/gtkdocklet.c:532
+#: ../gtk/gtkprefs.c:1949
+msgid "Preferences"
+msgstr "Nastavitve"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Še ni podprto."
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Ste prepričani, da želite izbrisati \"%s\"?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "Izbriši stanje"
+
+#: ../console/gntstatus.c:167
+#: ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Shranjena stanja"
+
+#: ../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 "Naziv"
+
+#: ../console/gntstatus.c:174
+#: ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Vrsta"
+
+#: ../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:5396
+#: ../libgaim/protocols/oscar/oscar.c:5411
+#: ../libgaim/protocols/oscar/oscar.c:5416
+#: ../libgaim/protocols/oscar/oscar.c:5624
+#: ../libgaim/protocols/oscar/oscar.c:5636
+#: ../libgaim/protocols/oscar/oscar.c:5649
+#: ../libgaim/protocols/oscar/oscar.c:5656
+#: ../libgaim/protocols/oscar/oscar.c:5663
+#: ../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 "Sporočilo"
+
+#. Use
+#: ../console/gntstatus.c:186
+#: ../console/gntstatus.c:579
+msgid "Use"
+msgstr "Uporabi"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "Neveljaven naslov"
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "Podvojen naslov"
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "Vnesite drugačen naslov za stanje."
+
+#: ../console/gntstatus.c:439
+msgid "Substatus"
+msgstr "Podstanje"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:442
+#: ../gtk/gtkblist.c:4990
+#: ../gtk/gtkblist.c:5308
+msgid "Account:"
+msgstr "Račun:"
+
+#: ../console/gntstatus.c:450
+#: ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Stanje:"
+
+#: ../console/gntstatus.c:465
+msgid "Message:"
+msgstr "Sporočilo:"
+
+#: ../console/gntstatus.c:514
+msgid "Edit Status"
+msgstr "Uredi stanje"
+
+#: ../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 "Stanje"
+
+#: ../console/gntstatus.c:556
+msgid "Use different status for following accounts"
+msgstr "Za naslednje račune uporabi različno stanje"
+
+#. Save & Use
+#: ../console/gntstatus.c:590
+msgid "Save & Use"
+msgstr "Shrani in uporabi"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Stanja"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "Uporabnik %s se je ravnokar prijavil."
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "Uporabnik %s se je ravnokar odjavil."
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "Uporabnik %s vam je poslal sporočilo"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s je omenil/a vaš psevdonim v %s"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "Uporabnik %s je poslal sporočilo v %s"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Prijatelj se prijavi/odjavi"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "Prejemate sporočilo"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "Nekdo v sobi govori"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "Nekdo omeni vaše ime v sobi"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "Obvesti z opekačem, ko"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "Piskaj tudi!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+#: ../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 ""
+
+#: ../console/plugins/gnthistory.c:116
+#: ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Pogovor z %s o %s:</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138
+#: ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Vstavek za zgodovino zahteva beleženje v dnevnik"
 
-#: ../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"
@@ -858,1507 +1280,135 @@
 "\n"
 "Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete aktivira zgodovino za istovrstne pogovore."
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "Zgodovina"
-
-#: ../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 "Prikaže nedavno zabeležene pogovore v novih pogovorih."
 
-#: ../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."
 msgstr "Ko je odprt nov pogovor, ta vstavek vstavi zadnji pogovor v trenuten pogovor."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Pomanjšaj, ko sem odsoten"
-
-#. *< 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 "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
-
-#: ../plugins/idle.c:155
-#: ../plugins/idle.c:213
-msgid "Minutes"
-msgstr "minut"
-
-#. 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.
-#: ../plugins/idle.c:162
-#: ../plugins/idle.c:195
-#: ../plugins/idle.c:220
-#: ../plugins/idle.c:312
-msgid "I'dle Mak'er"
-msgstr "NedejavniK"
-
-#: ../plugins/idle.c:163
-#: ../plugins/idle.c:252
-msgid "Set Account Idle Time"
-msgstr "Nastavi čas nedejavnosti"
-
-#: ../plugins/idle.c:166
-#: ../plugins/idle.c:224
-msgid "_Set"
-msgstr "_Nastavi"
-
-#: ../plugins/idle.c:167
-#: ../plugins/idle.c:200
-#: ../plugins/idle.c:225
-msgid "_Cancel"
-msgstr "_Prekliči"
-
-#: ../plugins/idle.c:180
-msgid "None of your accounts are idle."
-msgstr "Noben od vaših računov ni nedejaven."
-
-#: ../plugins/idle.c:196
-#: ../plugins/idle.c:256
-msgid "Unset Account Idle Time"
-msgstr "Odnastavi čas nedejavnosti"
-
-#: ../plugins/idle.c:199
-msgid "_Unset"
-msgstr "_Odnastavi"
-
-#: ../plugins/idle.c:221
-#: ../plugins/idle.c:260
-msgid "Set Idle Time for All Accounts"
-msgstr "Nastavi čas nedejavnosti za vse račune"
-
-#: ../plugins/idle.c:265
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
-
-#: ../plugins/idle.c:314
-#: ../plugins/idle.c:315
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "Preskusni odjemalec IPC"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Preskusite vstavek s podporo IPC, kot odjemalec."
-
-#. *  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 "Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek in kliče registrirane ukaze."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "Preskusni strežnik IPC"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Preskusite vstavek s podporo IPC, kot strežnik."
-
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "Uporabnik ni na zvezi."
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "Samodejni odgovor poslan:"
-
-#: ../plugins/log_reader.c:1421
-#: ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s se je odjavil(a)."
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr "Eno ali več sporočil ni mogoče dostaviti."
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1448
-#: ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "Povezava s strežnikom je bila prekinjena."
-
-#: ../plugins/log_reader.c:1456
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne povežete."
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Sporočila ni mogoče poslati, saj je presežena največja dolžina."
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "Sporočila ni mogoče poslati."
-
-#. 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.
-#: ../plugins/log_reader.c:1838
-#: ../plugins/log_reader.c:1943
-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.
-#: ../plugins/log_reader.c:1850
-#: ../plugins/log_reader.c:1947
-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.
-#: ../plugins/log_reader.c:1862
-#: ../plugins/log_reader.c:1951
-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.
-#: ../plugins/log_reader.c:1874
-#: ../plugins/log_reader.c:1955
-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.
-#: ../plugins/log_reader.c:1886
-#: ../plugins/log_reader.c:1959
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1925
-msgid "General Log Reading Configuration"
-msgstr "Splošne nastavitve ogledovanja dnevnika"
-
-#: ../plugins/log_reader.c:1929
-msgid "Fast size calculations"
-msgstr "Hitri izračuni velikosti"
-
-#: ../plugins/log_reader.c:1933
-msgid "Use name heuristics"
-msgstr "Uporabi hevristiko imena"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1939
-msgid "Log Directory"
-msgstr "Imenik dnevnika"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1982
-msgid "Log Reader"
-msgstr "Ogledovalnik dnevnika"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1986
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
-
-#. * description
-#: ../plugins/log_reader.c:1990
-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 "Pri ogledovanju dnevnikov bo ta vstavek vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Preverjevalnik pošte"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Preveri morebitno novoprispelo pošto."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Nalaganje vstavkov Mono"
-
-#: ../plugins/mono/loader/mono.c:215
-#: ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Naloži vstavke .NET skupaj z Mono."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za sprejem."
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Seja glasbenega sporočanja potrjena."
-
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Glasbeno sporočanje"
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "Pri zaganjanju ukaza je prišlo do napake:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Napaka pri uporabi urejevalnika"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "Pprišlo do naslednje napake:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "Nastavitve glasbe sporočanja"
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Pot urejevalnika partiture"
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "Upor_abi"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
-
-#. *  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 "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Obveščaj o"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "Okna za _neposredne pogovore"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "_Pogovorna okna"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Le ko nekdo omeni vaše ime v sobi"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "Okna, ki imajo _fokus"
-
-#  ---------- "Notification Methods" ----------
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Načini obveščanja"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Dodaj _obvestilo v naslov okna:"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Prikaži _število novih sporočil v naslovu okna"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "Povzdigni pogovorna okn_a"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Odstranjevanje obvestil"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Odstrani, ko pogovorno okno _dobi fokus"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Odstrani, ko _kliknem na pogovorno okno"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Odstrani, ko _tipkam v pogovornem oknu"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Odstrani, ko je _sporočilo poslano"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Odstrani ob zamenjavi _zavihka pomenka"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Obvestila o sporočilih"
-
-#. *< 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 "Ponuja mnoge načine opozarjanja na nova sporočila."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Nalagalnik vstavkov Perl"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585
-#: ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
-
-#: ../plugins/psychic.c:19
-msgid "Psychic Mode"
-msgstr "Telepatski način"
-
-#: ../plugins/psychic.c:20
-msgid "Psychic mode for incoming conversation"
-msgstr "Telepatski način za dohodne pogovore"
-
-#: ../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 "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, Jabber, Sametime in 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."
-#: ../plugins/psychic.c:63
-msgid "You feel a disturbance in the force..."
-msgstr "Občutite motnjo v Moči (saj veste, Vojna zvezd) ..."
-
-#: ../plugins/psychic.c:82
-msgid "Only enable for users on the buddy list"
-msgstr "Dovoli le uporabnikom s seznama prijateljev"
-
-#: ../plugins/psychic.c:87
-msgid "Disable when away"
-msgstr "Onemogoči ob odsotnosti"
-
-#: ../plugins/psychic.c:91
-msgid "Display notification message in conversations"
-msgstr "Prikaži obvestilno sporočilo v pogovorih"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Direktno"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Omogoča neposreden vnos v protokole."
-
-#: ../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 "Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte kodno okno."
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Uporabljate Gaim različice %s.  Trenutna različica je %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Dnevnik sprememb:</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 "Različico %s lahko najdete na:<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 "Na voljo je nova različica."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Obvestilo o izdaji"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Preverjaj, ali je na voljo nova različica."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Preskus signalov"
-
-#. *< 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 "Preveri vse ukaze, da se prepriča o delujoči povezavi."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:37
-msgid "Simple Plugin"
-msgstr "Enostavni vstavek"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:40
-#: ../plugins/simple.c:42
-msgid "Tests to see that most things are working."
-msgstr "Preveri večino stvari, če delujejo."
-
-#: ../plugins/spellchk.c:1918
-msgid "Duplicate Correction"
-msgstr "Popravek dvojnikov"
-
-#: ../plugins/spellchk.c:1919
-msgid "The specified word already exists in the correction list."
-msgstr "Navedena beseda že obstaja v seznamu popravkov."
-
-#: ../plugins/spellchk.c:2128
-msgid "Text Replacements"
-msgstr "Zamenjave besedila"
-
-#: ../plugins/spellchk.c:2151
-msgid "You type"
-msgstr "Vi napišete"
-
-#: ../plugins/spellchk.c:2165
-msgid "You send"
-msgstr "Jaz pošljem"
-
-#: ../plugins/spellchk.c:2179
-msgid "Whole words only"
-msgstr "Samo cele besede"
-
-#: ../plugins/spellchk.c:2191
-msgid "Case sensitive"
-msgstr "Razlikuj velike in male črke"
-
-#: ../plugins/spellchk.c:2217
-msgid "Add a new text replacement"
-msgstr "Dodaj novo zamenjavo"
-
-#: ../plugins/spellchk.c:2233
-msgid "You _type:"
-msgstr "Vi _napišete:"
-
-#: ../plugins/spellchk.c:2250
-msgid "You _send:"
-msgstr "Jaz _pošljem:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2262
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
-
-#: ../plugins/spellchk.c:2264
-msgid "Only replace _whole words"
-msgstr "Zamenjaj le _cele besede"
-
-#: ../plugins/spellchk.c:2289
-msgid "General Text Replacement Options"
-msgstr "Splošne možnosti zamenjave besedila"
-
-#: ../plugins/spellchk.c:2290
-msgid "Enable replacement of last word on send"
-msgstr "Omogoči zamenjavo zadnje besede pri pošiljanju"
-
-#: ../plugins/spellchk.c:2315
-msgid "Text replacement"
-msgstr "Zamenjava besedila"
-
-#: ../plugins/spellchk.c:2317
-#: ../plugins/spellchk.c:2318
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
-
-#. *< 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 "Omogoča podporo SSL preko 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 "Omogoča podporo SSL preko 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 "Omogoča ovojnico za knjižnice s podporo SSL."
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s se je vrnil."
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s je zdaj odsoten."
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s je nedejaven."
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s ni več nedejaven."
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s se je prijavil(a)."
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "Obvesti, ko"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "postaja prijatelj _odsoten"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "postaja prijatelj _nedejaven"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "Prijatelj _se prijavi/odjavi"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "Obvestila o stanjih prijateljev"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145
-#: ../plugins/statenotify.c:148
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "V pogovornem oknu obvešča o spremembah stanja vaših prijateljev."
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Nalaganje vstavkov Tcl"
-
-#: ../plugins/tcl/tcl.c:371
-#: ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "Omogoča podporo nalaganja vstavkov Tcl"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77
-#: ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Nabodalo prijateljev"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358
-#: ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Vodoravna inačica seznama prijateljev."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "Časovni žig iChat"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Zakasnitev"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minut."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "Čas nastanka"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:259
-#: ../plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Doda čase nastanka vsakih N minut v slogu iChata."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Možnosti zapisa časovnega žiga"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Prisili (tradicionalni Gaim) 24-urni časovni zapis"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Pokaži datume v ..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Po_govori:"
-
-#: ../plugins/timestamp_format.c:37
-#: ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Za zakasnjena sporočila"
-
-#: ../plugins/timestamp_format.c:38
-#: ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Za zakasnjena sporočila in v pogovorih"
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Dnevniki _sporočil:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "Zapisi časovnega žiga sporočil"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "Prilagodi oblike časovnega žiga sporočil po meri."
-
-#. *  description
-#: ../plugins/timestamp_format.c:155
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Neprosojnost:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Pogovorna okna"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Pro_sojnost pogovornega okna"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Prikaži drsno vrstico v pogovornem oknu"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Odstrani prosojnost pogovornega okna v ospredju"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Vedno na vrhu"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Seznam prijateljev"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "_Prosojnost seznama prijateljev"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Prosojnost"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Poljubna prosojnost seznama prijateljev in pomenkov."
-
-#. *  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 ""
-"Ta vstavek omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
-"\n"
-"* Pozor: Ta vstavek zahteva Win2000 ali novejše."
-
-#: ../plugins/win32/winprefs/winprefs.c:434
-msgid "GTK+ Runtime Version"
-msgstr "Nastavitve GTK+"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:442
-msgid "Startup"
-msgstr "Zagon"
-
-#: ../plugins/win32/winprefs/winprefs.c:443
-msgid "_Start Gaim on Windows startup"
-msgstr "Za_ženi Gaim ob zagonu Windows"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455
-#: ../src/gtkblist.c:3667
-msgid "Buddy List"
-msgstr "Seznam prijateljev"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "_Dockable Buddy List"
-msgstr "Le_pljiv seznam prijateljev"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:460
-msgid "_Keep Buddy List window on top:"
-msgstr "_Ohrani seznam prijateljev nad vrhu:"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:465
-msgid "Only when docked"
-msgstr "samo, ko je lepljiv"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:469
-#: ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1879
-msgid "Conversations"
-msgstr "Pogovori"
-
-#: ../plugins/win32/winprefs/winprefs.c:470
-msgid "_Flash window when messages are received"
-msgstr "Utrip_aj z oknom, ko prispe novo sporočilo"
-
-#: ../plugins/win32/winprefs/winprefs.c:494
-msgid "WinGaim Options"
-msgstr "Možnosti Gaim za Windows"
-
-#: ../plugins/win32/winprefs/winprefs.c:496
-msgid "Options specific to Windows Gaim."
-msgstr "Nastavitve, specifične za okolje Windows."
-
-#: ../plugins/win32/winprefs/winprefs.c:497
-msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
-msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "Računi"
-
-#: ../src/account.c:918
-msgid "Password is required to sign on."
-msgstr "Za prijavo je potrebno geslo."
-
-#: ../src/account.c:943
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Vpišite geslo za %s (%s)"
-
-#: ../src/account.c:950
-msgid "Enter Password"
-msgstr "Vnesi geslo"
-
-#: ../src/account.c:955
-msgid "Save password"
-msgstr "Shrani geslo"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:963
-#: ../src/account.c:1134
-#: ../src/gtkblist.c:3551
-#: ../src/gtkdialogs.c:613
-#: ../src/gtkdialogs.c:750
-#: ../src/gtkdialogs.c:814
-#: ../src/gtkrequest.c:269
-#: ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:655
-#: ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1322
-#: ../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:1408
-#: ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260
-#: ../src/protocols/oscar/oscar.c:5690
-#: ../src/protocols/oscar/oscar.c:5870
-#: ../src/protocols/oscar/oscar.c:5895
-#: ../src/protocols/oscar/oscar.c:5951
-#: ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182
-#: ../src/protocols/silc/chat.c:424
-#: ../src/protocols/silc/chat.c:462
-#: ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1297
-#: ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753
-#: ../src/protocols/yahoo/yahoo.c:3059
-#: ../src/protocols/yahoo/yahoo.c:3068
-#: ../src/request.h:1344
-msgid "OK"
-msgstr "V redu"
-
-#: ../src/account.c:964
-#: ../src/account.c:1135
-#: ../src/account.c:1172
-#: ../src/gtkaccount.c:2182
-#: ../src/gtkaccount.c:2649
-#: ../src/gtkblist.c:5019
-#: ../src/gtkdialogs.c:614
-#: ../src/gtkdialogs.c:751
-#: ../src/gtkdialogs.c:815
-#: ../src/gtkdialogs.c:834
-#: ../src/gtkdialogs.c:856
-#: ../src/gtkdialogs.c:876
-#: ../src/gtkdialogs.c:920
-#: ../src/gtkdialogs.c:975
-#: ../src/gtkdialogs.c:1012
-#: ../src/gtkdialogs.c:1037
-#: ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296
-#: ../src/gtkpounce.c:1077
-#: ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581
-#: ../src/gtkprivacy.c:606
-#: ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:270
-#: ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498
-#: ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:792
-#: ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:594
-#: ../src/protocols/jabber/buddy.c:1721
-#: ../src/protocols/jabber/buddy.c:1755
-#: ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:828
-#: ../src/protocols/jabber/jabber.c:1323
-#: ../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:1409
-#: ../src/protocols/oscar/oscar.c:2168
-#: ../src/protocols/oscar/oscar.c:2209
-#: ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5691
-#: ../src/protocols/oscar/oscar.c:5743
-#: ../src/protocols/oscar/oscar.c:5871
-#: ../src/protocols/oscar/oscar.c:5896
-#: ../src/protocols/oscar/oscar.c:5952
-#: ../src/protocols/oscar/oscar.c:6021
-#: ../src/protocols/oscar/peer.c:942
-#: ../src/protocols/sametime/sametime.c:3368
-#: ../src/protocols/sametime/sametime.c:3453
-#: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5312
-#: ../src/protocols/sametime/sametime.c:5401
-#: ../src/protocols/sametime/sametime.c:5525
-#: ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078
-#: ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:597
-#: ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911
-#: ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959
-#: ../src/protocols/yahoo/yahoo.c:3060
-#: ../src/protocols/yahoo/yahoo.c:3069
-#: ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../src/account.c:989
-#: ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Manjka vstavek za protokol %s"
-
-#: ../src/account.c:991
-#: ../src/connection.c:99
-#: ../src/gtkblist.c:3549
-msgid "Connection Error"
-msgstr "Napaka na povezavi"
-
-#: ../src/account.c:1071
-#: ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1275
-msgid "New passwords do not match."
-msgstr "Novi gesli se ne ujemata."
-
-#: ../src/account.c:1080
-msgid "Fill out all fields completely."
-msgstr "Izpolnite vsa polja."
-
-#: ../src/account.c:1103
-msgid "Original password"
-msgstr "Obstoječe geslo"
-
-#: ../src/account.c:1110
-msgid "New password"
-msgstr "Novo geslo"
-
-#: ../src/account.c:1117
-msgid "New password (again)"
-msgstr "Novo geslo (ponovno)"
-
-#: ../src/account.c:1123
-#, c-format
-msgid "Change password for %s"
-msgstr "Spremeni geslo za %s"
-
-#: ../src/account.c:1131
-msgid "Please enter your current password and your new password."
-msgstr "Vnesite svoje obstoječe in novo geslo."
-
-#: ../src/account.c:1164
-#, c-format
-msgid "Change user information for %s"
-msgstr "Spremeni podatke za uporabika %s"
-
-#: ../src/account.c:1167
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Nastavi informacije o uporabniku"
-
-#: ../src/account.c:1171
-#: ../src/gtkdebug.c:684
-#: ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:593
-msgid "Save"
-msgstr "Shrani"
-
-#: ../src/account.c:1681
-#: ../src/gtkft.c:159
-#: ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:636
-#: ../src/protocols/jabber/buddy.c:1357
-#: ../src/protocols/jabber/buddy.c:1374
-#: ../src/protocols/novell/novell.c:2858
-msgid "Unknown"
-msgstr "Neznan"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "Seznam prijateljev"
-
-#: ../src/blist.c:1179
-msgid "Chats"
-msgstr "Pomenki"
-
-#: ../src/blist.c:1901
-#, 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 prijateljev iz skupine %s ni bilo odstranjenih, ker pripadajo računom, ki so trenutno onemogočeni ali niso prijavljeni.  Niti prijatelji niti skupine niso bili odstranjeni.\n"
-msgstr[1] "%d prijatelj iz skupine %s ni bil odstranjen, ker pripada računu, ki je trenutno onemogočen ali ni prijavljen.  Niti prijatelj niti skupina nista bila odstranjena.\n"
-msgstr[2] "%d prijatelja iz skupine %s nista bila odstranjena, ker pripadata računoma, ki sta trenutno onemogočena ali nista prijavljena.  Niti prijatelja niti skupina niso bili odstranjeni.\n"
-msgstr[3] "%d prijatelji iz skupine %s niso bili odstranjeni, ker pripadajo računom, ki so trenutno onemogočeni ali niso prijavljeni.  Niti prijatelji niti skupine niso bili odstranjeni.\n"
-
-#: ../src/blist.c:1911
-msgid "Group not removed"
-msgstr "Skupina ni bila odstranjena"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Napaka pri prijavi"
-
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s se je prijavil(a)"
-
-#: ../src/connection.c:313
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s se je odjavil(a)"
-
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "Sporočila ni mogoče poslati, ker je preveliko."
-
-#: ../src/conversation.c:166
-#: ../src/conversation.c:179
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Sporočila k %s ni mogoče poslati."
-
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "Sporočilo je preveliko."
-
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "Sporočila ni mogoče poslati."
-
-#: ../src/conversation.c:1517
-#, c-format
-msgid "%s entered the room."
-msgstr "%s se nam pridružuje."
-
-#: ../src/conversation.c:1520
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] se nam pridružuje."
-
-#: ../src/conversation.c:1627
-#, c-format
-msgid "You are now known as %s"
-msgstr "Zdaj ste znani kot %s"
-
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s je zdaj poznan kot %s"
-
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s nas je zapustil."
-
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s nas je zapustil (%s)."
-
-#: ../src/desktopitem.c:286
-#: ../src/desktopitem.c:877
-msgid "No name"
-msgstr "Brez imena"
-
-#: ../src/ft.c:189
-#: ../src/protocols/msn/msn.c:410
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Napaka pri branju %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Napaka pri pisanju na strežnik %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Napaka pri dostopu do %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Datoteke z 0 bajti ni mogoče poslati."
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Imenika ni mogoče poslati."
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s vam želi poslati %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s vam želi poslati datoteko"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Sprejmete zahtevo po prenosu datoteke od %s?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Na voljo je datoteka za prenos iz:\n"
-"Oddaljen gostitelj: %s\n"
-"Oddaljena vrata: %d"
-
-#: ../src/ft.c:391
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s ponuja pošiljanje datoteke %s"
-
-#: ../src/ft.c:443
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s ni veljavna datoteka.\n"
-
-#: ../src/ft.c:464
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Ponujeno pošiljanje sporočila %s k %s"
-
-#: ../src/ft.c:476
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Začetek prenosa %s od %s"
-
-#: ../src/ft.c:630
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Prenos datoteke %s je dokončan."
-
-#: ../src/ft.c:633
-msgid "File transfer complete"
-msgstr "Prenos datoteke je dokončan."
-
-#: ../src/ft.c:1030
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Prekinili ste prenos %s"
-
-#: ../src/ft.c:1035
-msgid "File transfer cancelled"
-msgstr "Prenos datoteke je preklican"
-
-#: ../src/ft.c:1093
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s je prekinil prenos %s"
-
-#: ../src/ft.c:1098
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s je prekinil prenos datoteke"
-
-#: ../src/ft.c:1155
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "Prenos datoteke do %s ni uspel."
-
-#: ../src/ft.c:1157
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "Prenos datoteke od %s ni uspel."
-
-#: ../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>Datoteka:</b> %s\n"
-"<b>Velikost:</b> %s\n"
-"<b>Velikost slike:</b> %dx%d"
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:123
+#: ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr ""
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Postavitev"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Postavitev pladnja."
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Psevdonim"
+
+#. join button
+#: ../gtk/gaimstock.c:138
+#: ../gtk/gtkblist.c:1120
+#: ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "_Pridruži se"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "Zapri _zavihke"
+
+#: ../gtk/gaimstock.c:140
+#: ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "_Sporoči"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "_Informacije"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "Povab_i"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Spremeni"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Odpri pošto"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145
+#: ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "_Premor"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Možnosti prijave"
 
-#: ../src/gtkaccount.c:779
-#: ../src/gtkft.c:642
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Geslo:"
-
-#: ../src/gtkaccount.c:863
-#: ../src/gtkblist.c:4597
-#: ../src/gtkblist.c:4963
-msgid "Alias:"
-msgstr "Psevdonim:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "Zapomni si geslo"
+#: ../gtk/gtkaccount.c:483
+msgid "Local alias:"
+msgstr "Krajevni nadimek:"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "Obveščanje o prispeli pošti"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "Ikona prijatelja:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr "Za ta račun uporabi to ikono prijatelja:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "%s Možnosti"
 
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splošno nastavitev strežnikov proxy"
 
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "brez strežnika 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 "SOCKS4"
 
-#: ../src/gtkaccount.c:1257
+#: ../gtk/gtkaccount.c:891
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: ../src/gtkaccount.c:1263
-#: ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:897
+#: ../gtk/gtkprefs.c:1095
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -2367,342 +1417,284 @@
 #. 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.
-#: ../src/gtkaccount.c:1302
+#: ../gtk/gtkaccount.c:936
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1305
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: ../src/gtkaccount.c:1326
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: ../src/gtkaccount.c:1340
-#: ../src/gtkprefs.c:1052
+#: ../gtk/gtkaccount.c:974
+#: ../gtk/gtkprefs.c:1089
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: ../src/gtkaccount.c:1349
-#: ../src/gtkprefs.c:1073
+#: ../gtk/gtkaccount.c:983
+#: ../gtk/gtkprefs.c:1110
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: ../src/gtkaccount.c:1353
-#: ../src/gtkprefs.c:1091
+#: ../gtk/gtkaccount.c:987
+#: ../gtk/gtkprefs.c:1128
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../src/gtkaccount.c:1361
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../src/gtkaccount.c:1367
-#: ../src/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1001
+#: ../gtk/gtkprefs.c:1165
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: ../src/gtkaccount.c:1747
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../src/gtkaccount.c:1749
-#: ../src/gtkblist.c:3552
-msgid "Modify Account"
-msgstr "Spremeni račun"
-
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../src/gtkaccount.c:1782
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "N_apredno"
 
 #. Register button
-#: ../src/gtkaccount.c:1797
-#: ../src/protocols/jabber/jabber.c:827
+#: ../gtk/gtkaccount.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:849
 msgid "Register"
 msgstr "Registriraj se"
 
-#: ../src/gtkaccount.c:2176
-#: ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Ste prepričani, da želite izbrisati %s?"
-
-#: ../src/gtkaccount.c:2181
-#: ../src/gtkpounce.c:1076
-#: ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Zbriši"
-
-#: ../src/gtkaccount.c:2239
-#: ../src/gtksavedstatuses.c:889
-#: ../src/protocols/oscar/oscar.c:2823
-msgid "Screen Name"
-msgstr "Ime"
-
-#: ../src/gtkaccount.c:2270
+#: ../gtk/gtkaccount.c:1919
+#: ../gtk/gtkplugin.c:576
+msgid "Enabled"
+msgstr "Omogočen"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/gtkaccount.c:2597
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
-
-#: ../src/gtkaccount.c:2646
-msgid "Add buddy to your list?"
-msgstr "Želite dodati prijatelja na seznam?"
-
-#: ../src/gtkaccount.c:2648
-#: ../src/gtkblist.c:5018
-#: ../src/gtkconv.c:1625
-#: ../src/gtkrequest.c:274
-#: ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5400
-#: ../src/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/gtkblist.c:673
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../src/gtkblist.c:694
+#: ../gtk/gtkblist.c:726
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
-#: ../src/gtkblist.c:705
-#: ../src/gtkpounce.c:519
-#: ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737
+#: ../gtk/gtkpounce.c:523
+#: ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../src/gtkblist.c:949
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../src/gtkblist.c:952
-#: ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "_Sporoči"
-
-#: ../src/gtkblist.c:958
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: ../src/gtkblist.c:965
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: ../src/gtkblist.c:969
-#: ../src/gtkblist.c:973
-#: ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1021
+#: ../gtk/gtkblist.c:1025
+#: ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: ../src/gtkblist.c:984
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "Psevdonim ..."
 
-#: ../src/gtkblist.c:987
-#: ../src/gtkconv.c:1622
-#: ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "Odstrani"
-
-#: ../src/gtkblist.c:993
-#: ../src/gtkblist.c:1080
-#: ../src/gtkblist.c:1101
+#: ../gtk/gtkblist.c:1045
+#: ../gtk/gtkblist.c:1132
+#: ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: ../src/gtkblist.c:995
-#: ../src/gtkblist.c:1082
-#: ../src/gtkblist.c:1103
+#: ../gtk/gtkblist.c:1047
+#: ../gtk/gtkblist.c:1134
+#: ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../src/gtkblist.c:1043
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: ../src/gtkblist.c:1045
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: ../src/gtkblist.c:1048
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "_Zbriši skupino"
 
-#: ../src/gtkblist.c:1050
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#. join button
-#: ../src/gtkblist.c:1068
-#: ../src/gtkroomlist.c:285
-#: ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Pridruži se"
-
-#: ../src/gtkblist.c:1070
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../src/gtkblist.c:1108
-#: ../src/gtkblist.c:1131
+#: ../gtk/gtkblist.c:1160
+#: ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../src/gtkblist.c:1136
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../src/gtkblist.c:1382
-#: ../src/gtkblist.c:1394
-#: ../src/gtkblist.c:3812
-#: ../src/gtkblist.c:3822
+#: ../gtk/gtkblist.c:1434
+#: ../gtk/gtkblist.c:1446
+#: ../gtk/gtkblist.c:4115
+#: ../gtk/gtkblist.c:4125
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../src/gtkblist.c:1854
-#: ../src/gtkconv.c:4245
-#: ../src/gtkpounce.c:418
+#: ../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 "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2500
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2501
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:2430
+#: ../gtk/gtkblist.c:2502
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../src/gtkblist.c:2431
+#: ../gtk/gtkblist.c:2503
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../src/gtkblist.c:2432
+#: ../gtk/gtkblist.c:2504
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: ../src/gtkblist.c:2434
+#: ../gtk/gtkblist.c:2506
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prikaži prijatelje, ki niso na z_vezi"
 
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2507
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prikaži pra_zne skupine"
 
-#: ../src/gtkblist.c:2436
+#: ../gtk/gtkblist.c:2508
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
 
-#: ../src/gtkblist.c:2437
+#: ../gtk/gtkblist.c:2509
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
 
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2510
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2512
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../src/gtkblist.c:2441
+#: ../gtk/gtkblist.c:2513
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../src/gtkblist.c:2442
+#: ../gtk/gtkblist.c:2514
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2516
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2447
+#: ../gtk/gtkblist.c:2519
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../src/gtkblist.c:2448
-#: ../src/gtkblist.c:5595
+#: ../gtk/gtkblist.c:2520
+#: ../gtk/gtkblist.c:5967
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2523
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2524
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2525
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vstav_ki"
 
-#: ../src/gtkblist.c:2454
+#: ../gtk/gtkblist.c:2526
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../src/gtkblist.c:2455
+#: ../gtk/gtkblist.c:2527
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2529
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2530
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../src/gtkblist.c:2459
+#: ../gtk/gtkblist.c:2531
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../src/gtkblist.c:2461
+#: ../gtk/gtkblist.c:2533
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2536
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../src/gtkblist.c:2465
+#: ../gtk/gtkblist.c:2537
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2538
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2539
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../src/gtkblist.c:2499
-#: ../src/gtkblist.c:2568
+#: ../gtk/gtkblist.c:2571
+#: ../gtk/gtkblist.c:2640
 #, c-format
 msgid ""
 "\n"
@@ -2711,7 +1703,7 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../src/gtkblist.c:2580
+#: ../gtk/gtkblist.c:2652
 #, c-format
 msgid ""
 "\n"
@@ -2720,7 +1712,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2729,7 +1721,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: ../src/gtkblist.c:2601
+#: ../gtk/gtkblist.c:2673
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +1730,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: ../src/gtkblist.c:2612
+#: ../gtk/gtkblist.c:2684
 #, c-format
 msgid ""
 "\n"
@@ -2747,7 +1739,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../gtk/gtkblist.c:2719
 #, c-format
 msgid ""
 "\n"
@@ -2756,7 +1748,7 @@
 "\n"
 "<b>Zadnjič viden:</b> pred %s"
 
-#: ../src/gtkblist.c:2656
+#: ../gtk/gtkblist.c:2728
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2764,7 +1756,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: ../src/gtkblist.c:2667
+#: ../gtk/gtkblist.c:2739
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2772,7 +1764,7 @@
 "\n"
 "<b>Opis:</b> Strašljivo"
 
-#: ../src/gtkblist.c:2669
+#: ../gtk/gtkblist.c:2741
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2780,7 +1772,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: ../src/gtkblist.c:2671
+#: ../gtk/gtkblist.c:2743
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2788,191 +1780,215 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: ../src/gtkblist.c:2962
+#: ../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:5446
+#: ../libgaim/protocols/yahoo/yahoo.c:2883
+#: ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Brez povezave"
+
+#: ../gtk/gtkblist.c:3226
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../src/gtkblist.c:2964
+#: ../gtk/gtkblist.c:3228
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967
-#: ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333
-#: ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/buddy.c:672
-#: ../src/protocols/msn/msn.c:550
-#: ../src/protocols/msn/state.c:32
-#: ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2844
-#: ../src/protocols/yahoo/yahoo.c:2727
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3231
+#: ../gtk/gtkprefs.c:1805
+#: ../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:2825
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../src/gtkblist.c:3099
+#: ../gtk/gtkblist.c:3359
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:3100
-#: ../src/gtkblist.c:3133
+#: ../gtk/gtkblist.c:3360
+#: ../gtk/gtkblist.c:3393
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../src/gtkblist.c:3101
+#: ../gtk/gtkblist.c:3361
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../src/gtkblist.c:3102
+#: ../gtk/gtkblist.c:3362
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../src/gtkblist.c:3103
-#: ../src/gtkblist.c:3136
+#: ../gtk/gtkblist.c:3363
+#: ../gtk/gtkblist.c:3396
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../src/gtkblist.c:3104
+#: ../gtk/gtkblist.c:3364
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../src/gtkblist.c:3139
+#: ../gtk/gtkblist.c:3399
 msgid "/Tools/Buddy Pounces"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: ../src/gtkblist.c:3142
+#: ../gtk/gtkblist.c:3402
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../src/gtkblist.c:3145
+#: ../gtk/gtkblist.c:3405
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../src/gtkblist.c:3339
+#: ../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 neprebranih sporočil od %s\n"
+msgstr[1] "%d neprebrano sporočilo od %s\n"
+msgstr[2] "%d neprebrani sporočili od %s\n"
+msgstr[3] "%d neprebrana sporočila od %s\n"
+
+#: ../gtk/gtkblist.c:3577
 msgid "Manually"
 msgstr "ročno"
 
-#: ../src/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3579
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../src/gtkblist.c:3342
+#: ../gtk/gtkblist.c:3580
 msgid "By status"
 msgstr "po stanju"
 
-#: ../src/gtkblist.c:3343
+#: ../gtk/gtkblist.c:3581
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../src/gtkblist.c:3544
-#: ../src/gtkconn.c:184
+#: ../gtk/gtkblist.c:3789
+#: ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../src/gtkblist.c:3553
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../gtk/gtkblist.c:3798
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../src/gtkblist.c:3553
+#: ../gtk/gtkblist.c:3798
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
-#: ../src/gtkblist.c:3574
+#: ../gtk/gtkblist.c:3819
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../src/gtkblist.c:3701
+#: ../gtk/gtkblist.c:3948
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3806
+#: ../gtk/gtkblist.c:4109
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: ../src/gtkblist.c:3809
+#: ../gtk/gtkblist.c:4112
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: ../src/gtkblist.c:3815
+#: ../gtk/gtkblist.c:4118
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
 
-#: ../src/gtkblist.c:3818
+#: ../gtk/gtkblist.c:4121
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Pokaži čase nedejavnosti"
 
-#: ../src/gtkblist.c:4554
+#: ../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 "Prijatelji"
+
+#: ../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. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim vnesite ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
 
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4624
-#: ../src/gtkblist.c:4943
-msgid "Account:"
-msgstr "Račun:"
-
-#: ../src/gtkblist.c:4876
+#: ../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 "Skupina:"
+
+#: ../gtk/gtkblist.c:5241
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../src/gtkblist.c:4892
+#: ../gtk/gtkblist.c:5257
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: ../src/gtkblist.c:4909
-msgid "Add Chat"
-msgstr "Dodaj pomenek"
-
-#: ../src/gtkblist.c:4933
+#: ../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"
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: ../src/gtkblist.c:5015
-#: ../src/protocols/sametime/sametime.c:5311
-#: ../src/protocols/sametime/sametime.c:5398
-msgid "Add Group"
-msgstr "Dodaj skupino"
-
-#: ../src/gtkblist.c:5016
+#: ../gtk/gtkblist.c:5381
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../src/gtkblist.c:5635
+#: ../gtk/gtkblist.c:6007
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../src/gtkblist.c:5668
-#: ../src/gtkblist.c:5674
-#: ../src/gtkconv.c:2753
+#: ../gtk/gtkblist.c:6040
+#: ../gtk/gtkblist.c:6046
+#: ../gtk/gtkconv.c:2839
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../src/gtkblist.c:5682
+#: ../gtk/gtkblist.c:6054
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../src/gtkblist.c:5694
+#: ../gtk/gtkblist.c:6066
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../src/gtkblist.c:5747
+#: ../gtk/gtkblist.c:6119
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../src/gtkblist.c:5833
+#: ../gtk/gtkblist.c:6205
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
-#: ../src/gtkconn.c:185
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2981,370 +1997,318 @@
 "%s je bil odjavljen zaradi napake: %s\n"
 "Gaim se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are:  version"
-msgstr "Podprte možnosti razhroščevanja:  različica"
-
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "Tak ukaz ne obstaja (v tem sklopu)."
-
-#: ../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 ""
-"Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
-"V tem sklopu so na voljo naslednji ukazi:\n"
-
-#: ../src/gtkconv.c:482
-msgid "No such command."
-msgstr "Ta ukaz ne obstaja."
-
-#: ../src/gtkconv.c:489
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
-
-#: ../src/gtkconv.c:494
-msgid "Your command failed for an unknown reason."
-msgstr "Vaš ukaz iz neznanega razloga ni uspel."
-
-#: ../src/gtkconv.c:501
-msgid "That command only works in chats, not IMs."
-msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
-
-#: ../src/gtkconv.c:504
-msgid "That command only works in IMs, not chats."
-msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
-
-#: ../src/gtkconv.c:508
-msgid "That command doesn't work on this protocol."
-msgstr "Ta ukaz ne deluje na tem protokolu."
-
-#: ../src/gtkconv.c:743
-#: ../src/gtkconv.c:769
+#: ../gtk/gtkconv.c:746
+#: ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../src/gtkconv.c:763
+#: ../gtk/gtkconv.c:766
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: ../src/gtkconv.c:816
+#: ../gtk/gtkconv.c:819
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:846
+#: ../gtk/gtkconv.c:849
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: ../src/gtkconv.c:867
+#: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../src/gtkconv.c:887
-#: ../src/gtksavedstatuses.c:1107
-#: ../src/gtksavedstatuses.c:1443
+#: ../gtk/gtkconv.c:890
+#: ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../src/gtkconv.c:944
-#: ../src/gtkconv.c:2370
-#: ../src/gtkdebug.c:217
-#: ../src/gtkft.c:490
+#: ../gtk/gtkconv.c:947
+#: ../gtk/gtkconv.c:2400
+#: ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../src/gtkconv.c:950
+#: ../gtk/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../src/gtkconv.c:974
+#: ../gtk/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../src/gtkconv.c:1095
-#: ../src/gtkdebug.c:165
-#: ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1124
+#: ../gtk/gtkdebug.c:166
+#: ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Najdi"
 
-#: ../src/gtkconv.c:1121
-#: ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1150
+#: ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../src/gtkconv.c:1292
+#: ../gtk/gtkconv.c:1321
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: ../src/gtkconv.c:1300
+#: ../gtk/gtkconv.c:1329
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: ../src/gtkconv.c:1562
-msgid "IM"
-msgstr "Sporoči"
-
-#: ../src/gtkconv.c:1573
-#: ../src/protocols/oscar/oscar.c:640
-msgid "Send File"
-msgstr "Pošlji datoteko"
-
-#: ../src/gtkconv.c:1588
+#: ../gtk/gtkconv.c:1597
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../src/gtkconv.c:1591
+#: ../gtk/gtkconv.c:1600
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/gtkconv.c:1601
-msgid "Info"
-msgstr "Informacije"
-
-#: ../src/gtkconv.c:1611
+#: ../gtk/gtkconv.c:1620
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../src/gtkconv.c:1634
+#: ../gtk/gtkconv.c:1643
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../src/gtkconv.c:2378
+#: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../src/gtkconv.c:2402
+#: ../gtk/gtkconv.c:2479
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../src/gtkconv.c:2451
+#: ../gtk/gtkconv.c:2528
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../src/gtkconv.c:2456
+#: ../gtk/gtkconv.c:2533
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../src/gtkconv.c:2462
+#: ../gtk/gtkconv.c:2536
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
+#: ../gtk/gtkconv.c:2540
+msgid "Set Custom Icon..."
+msgstr "Nastavi ikono po meri ..."
+
+#: ../gtk/gtkconv.c:2547
+msgid "Remove Custom Icon"
+msgstr "Odstrani ikono po meri"
+
 #. Conversation menu
-#: ../src/gtkconv.c:2602
+#: ../gtk/gtkconv.c:2688
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../src/gtkconv.c:2604
+#: ../gtk/gtkconv.c:2690
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporočilo ..."
 
-#: ../src/gtkconv.c:2609
+#: ../gtk/gtkconv.c:2695
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2697
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: ../src/gtkconv.c:2612
+#: ../gtk/gtkconv.c:2698
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../src/gtkconv.c:2614
+#: ../gtk/gtkconv.c:2700
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../src/gtkconv.c:2618
+#: ../gtk/gtkconv.c:2704
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../src/gtkconv.c:2619
+#: ../gtk/gtkconv.c:2705
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../src/gtkconv.c:2621
+#: ../gtk/gtkconv.c:2707
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2711
 msgid "/Conversation/M_ore"
 msgstr "/Pogovor/_Več"
 
-#: ../src/gtkconv.c:2629
+#: ../gtk/gtkconv.c:2715
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: ../src/gtkconv.c:2631
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: ../src/gtkconv.c:2633
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../src/gtkconv.c:2635
+#: ../gtk/gtkconv.c:2721
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../src/gtkconv.c:2640
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: ../src/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../src/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2733
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../src/gtkconv.c:2651
+#: ../gtk/gtkconv.c:2737
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../src/gtkconv.c:2652
+#: ../gtk/gtkconv.c:2738
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../src/gtkconv.c:2653
+#: ../gtk/gtkconv.c:2739
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../src/gtkconv.c:2654
+#: ../gtk/gtkconv.c:2740
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2656
+#: ../gtk/gtkconv.c:2742
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za _oblikovanje"
 
-#: ../src/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2743
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pr_ikaži časovne žige"
 
-#: ../src/gtkconv.c:2732
+#: ../gtk/gtkconv.c:2818
 msgid "/Conversation/More"
 msgstr "/Pogovor/Več"
 
-#: ../src/gtkconv.c:2770
-#: ../src/gtkconv.c:2797
+#. 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 "/Pogovor"
 
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2903
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prikaži dnevnik ..."
 
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2909
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../src/gtkconv.c:2817
+#: ../gtk/gtkconv.c:2913
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../src/gtkconv.c:2823
+#: ../gtk/gtkconv.c:2919
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../src/gtkconv.c:2827
+#: ../gtk/gtkconv.c:2923
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../src/gtkconv.c:2833
+#: ../gtk/gtkconv.c:2929
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../src/gtkconv.c:2837
+#: ../gtk/gtkconv.c:2933
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../src/gtkconv.c:2841
+#: ../gtk/gtkconv.c:2937
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../src/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2941
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../src/gtkconv.c:2851
+#: ../gtk/gtkconv.c:2947
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../src/gtkconv.c:2855
+#: ../gtk/gtkconv.c:2951
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../src/gtkconv.c:2861
+#: ../gtk/gtkconv.c:2957
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../src/gtkconv.c:2864
+#: ../gtk/gtkconv.c:2960
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../src/gtkconv.c:2877
+#: ../gtk/gtkconv.c:2973
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za oblikovanje"
 
-#: ../src/gtkconv.c:2880
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Prikaži časovne žige"
 
-#: ../src/gtkconv.c:2883
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2963
+#: ../gtk/gtkconv.c:3055
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../src/gtkconv.c:2966
+#: ../gtk/gtkconv.c:3058
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3149
+#: ../gtk/gtkconv.c:3241
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: ../src/gtkconv.c:3801
+#: ../gtk/gtkconv.c:3943
 msgid "_Send"
 msgstr "_Pošlji"
 
-#: ../src/gtkconv.c:3856
-#: ../src/protocols/sametime/sametime.c:3564
+#: ../gtk/gtkconv.c:3997
+#: ../libgaim/protocols/sametime/sametime.c:3557
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3908
+#: ../gtk/gtkconv.c:4049
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: ../src/gtkconv.c:3987
-msgid "IM the user"
-msgstr "Pošlji sporočilo uporabniku"
-
-#: ../src/gtkconv.c:4000
-msgid "Ignore the user"
-msgstr "Prezri uporabnika"
-
-#: ../src/gtkconv.c:4012
-msgid "Get the user's information"
-msgstr "Poizvedi o uporabniku"
-
-#: ../src/gtkconv.c:4998
-#: ../src/gtkconv.c:5107
+#: ../gtk/gtkconv.c:5096
+#: ../gtk/gtkconv.c:5217
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3353,529 +2317,533 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../src/gtkconv.c:5664
-#: ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5770
+#: ../gtk/gtkstatusbox.c:541
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../src/gtkconv.c:5670
+#: ../gtk/gtkconv.c:5776
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../src/gtkconv.c:5675
+#: ../gtk/gtkconv.c:5781
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../src/gtkconv.c:5685
+#: ../gtk/gtkconv.c:5786
+#: ../gtk/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Neprebrana sporočila"
+
+#: ../gtk/gtkconv.c:5791
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../src/gtkconv.c:6575
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
-
-#: ../src/gtkconv.c:6578
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
-
-#: ../src/gtkconv.c:6581
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
-
-#: ../src/gtkconv.c:6584
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Počisti izpisane replike pomenka."
-
-#: ../src/gtkconv.c:6587
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
-
-#: ../src/gtkconv.c:6746
+#: ../gtk/gtkconv.c:6905
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../src/gtkconv.c:6778
+#: ../gtk/gtkconv.c:6937
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: ../src/gtkconv.c:7300
+#: ../gtk/gtkconv.c:7472
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../src/gtkconv.c:7306
+#: ../gtk/gtkconv.c:7478
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../src/gtkconv.c:7314
+#: ../gtk/gtkconv.c:7486
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../src/gtkconv.c:7320
+#: ../gtk/gtkconv.c:7492
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../src/gtkconv.c:7580
+#: ../gtk/gtkconv.c:7760
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../src/gtkconv.c:8044
+#: ../gtk/gtkconv.c:8224
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../src/gtkconv.c:8046
+#: ../gtk/gtkconv.c:8226
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../src/gtkconv.c:8048
-#: ../src/gtkprefs.c:1258
+#: ../gtk/gtkconv.c:8228
+#: ../gtk/gtkprefs.c:1297
 msgid "New window"
 msgstr "novo okno"
 
-#: ../src/gtkconv.c:8050
+#: ../gtk/gtkconv.c:8230
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../src/gtkconv.c:8052
+#: ../gtk/gtkconv.c:8232
 msgid "By account"
 msgstr "po vrsti računa"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Shrani dnevnik razhroščevanja"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "Preobrni"
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
 msgstr "Obarvaj zadetke"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Razhroščevalno okno"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Počisti"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Premor"
-
-#: ../src/gtkdebug.c:705
-#: ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Prikaži čas"
-
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "Samo _ikona"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "Samo _besedilo"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "Tako ikona _kot besedilo"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filter"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Za več možnosti kliknite na desni miškin gumb."
 
-#: ../src/gtkdialogs.c:61
-#: ../src/gtkdialogs.c:104
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "Raven"
+
+#: ../gtk/gtkdebug.c:852
+#: ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "Vse"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "Razno"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "Napaka"
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Usodna napaka"
+
+#: ../gtk/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: ../src/gtkdialogs.c:62
-#: ../src/gtkdialogs.c:63
-#: ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66
-#: ../src/gtkdialogs.c:68
-#: ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70
-#: ../src/gtkdialogs.c:71
-#: ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:75
-#: ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+#: ../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 "razvijalec"
 
-#: ../src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "različica win32"
-
-#: ../src/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
 msgstr "razvijalec in oskrbnik spletne strani"
 
-#: ../src/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "podpora"
 
-#: ../src/gtkdialogs.c:97
-#: ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:101
+msgid "win32 port"
+msgstr "različica win32"
+
+#: ../gtk/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "vzdrževalec"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "vzdrževalec libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "razvijalec podpore protokola Jabber"
 
-#: ../src/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: ../src/gtkdialogs.c:110
-#: ../src/gtkdialogs.c:111
-#: ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "arabsko"
+
+#: ../gtk/gtkdialogs.c:116
+#: ../gtk/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:186
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: ../src/gtkdialogs.c:112
-#: ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "bengalsko"
 
-#: ../src/gtkdialogs.c:114
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "bosansko"
 
-#: ../src/gtkdialogs.c:115
-#: ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:121
+#: ../gtk/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:188
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: ../src/gtkdialogs.c:116
-#: ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
 msgstr "valencijansko-katalonsko"
 
-#: ../src/gtkdialogs.c:118
-#: ../src/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:189
 msgid "Czech"
 msgstr "češko"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "dansko"
 
-#: ../src/gtkdialogs.c:120
-#: ../src/gtkdialogs.c:121
-#: ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:190
 msgid "German"
 msgstr "nemško"
 
-#: ../src/gtkdialogs.c:122
-#: ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:128
+#: ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "grško"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: ../src/gtkdialogs.c:127
-#: ../src/gtkdialogs.c:179
-#: ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#: ../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 "špansko"
 
-#: ../src/gtkdialogs.c:128
-#: ../src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:136
 msgid "Euskera(Basque)"
 msgstr "baskijsko"
 
-#: ../src/gtkdialogs.c:130
-#: ../src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:139
 msgid "Persian"
 msgstr "perzijsko"
 
-#: ../src/gtkdialogs.c:132
-#: ../src/gtkdialogs.c:183
-#: ../src/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196
 msgid "Finnish"
 msgstr "finsko"
 
-#: ../src/gtkdialogs.c:133
-#: ../src/gtkdialogs.c:185
-#: ../src/gtkdialogs.c:186
-#: ../src/gtkdialogs.c:187
-#: ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:200
 msgid "French"
 msgstr "francosko"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:142
 msgid "Galician"
 msgstr "galicijsko"
 
-#: ../src/gtkdialogs.c:135
-#: ../src/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:143
+#: ../gtk/gtkdialogs.c:144
+msgid "Gujarati"
+msgstr "gujaratsko"
+
+#: ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:201
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:146
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: ../src/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:147
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#: ../src/gtkdialogs.c:138
-#: ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:202
 msgid "Italian"
 msgstr "italijansko"
 
-#: ../src/gtkdialogs.c:139
-#: ../src/gtkdialogs.c:191
-#: ../src/gtkdialogs.c:192
-#: ../src/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:205
 msgid "Japanese"
 msgstr "japonsko"
 
-#: ../src/gtkdialogs.c:140
-#: ../src/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:206
 msgid "Georgian"
 msgstr "gruzijsko"
 
-#: ../src/gtkdialogs.c:141
-#: ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:207
 msgid "Korean"
 msgstr "korejsko"
 
-#: ../src/gtkdialogs.c:142
-#: ../src/gtkdialogs.c:143
-#: ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:154
 msgid "Kurdish"
 msgstr "kurdsko"
 
-#: ../src/gtkdialogs.c:145
-#: ../src/gtkdialogs.c:196
-#: ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../src/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:156
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:157
+msgid "Nepali"
+msgstr "nepalsko"
+
+#: ../gtk/gtkdialogs.c:158
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:159
 msgid "Norwegian"
 msgstr "norveško"
 
-#: ../src/gtkdialogs.c:149
-#: ../src/gtkdialogs.c:150
-#: ../src/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:210
 msgid "Polish"
 msgstr "poljsko"
 
-#: ../src/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:162
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: ../src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:163
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:164
 msgid "Romanian"
 msgstr "romunsko"
 
-#: ../src/gtkdialogs.c:154
-#: ../src/gtkdialogs.c:199
-#: ../src/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:212
 msgid "Russian"
 msgstr "rusko"
 
-#: ../src/gtkdialogs.c:155
-#: ../src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:166
+#: ../gtk/gtkdialogs.c:167
 msgid "Serbian"
 msgstr "srbsko"
 
-#: ../src/gtkdialogs.c:157
-#: ../src/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:213
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:169
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: ../src/gtkdialogs.c:159
-#: ../src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:170
+msgid "Albanian"
+msgstr "albansko"
+
+#: ../gtk/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:214
 msgid "Swedish"
 msgstr "švedsko"
 
-#: ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:172
 msgid "Tamil"
 msgstr "tamilsko"
 
-#: ../src/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:173
 msgid "Telugu"
 msgstr "teluško"
 
-#: ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:174
 msgid "Thai"
 msgstr "tajsko"
 
-#: ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:175
 msgid "Turkish"
 msgstr "turško"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:176
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:176
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: ../src/gtkdialogs.c:165
-#: ../src/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:215
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167
-#: ../src/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:179
+#: ../gtk/gtkdialogs.c:216
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../src/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:185
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../src/gtkdialogs.c:245
+#: ../gtk/gtkdialogs.c:297
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: ../src/gtkdialogs.c:269
-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>"
-msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
-
-#: ../src/gtkdialogs.c:283
+#: ../gtk/gtkdialogs.c:331
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<br><br>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<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 na irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:286
+#: ../gtk/gtkdialogs.c:349
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:292
+#: ../gtk/gtkdialogs.c:355
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../src/gtkdialogs.c:307
+#: ../gtk/gtkdialogs.c:370
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:385
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../src/gtkdialogs.c:337
+#: ../gtk/gtkdialogs.c:400
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../src/gtkdialogs.c:357
+#: ../gtk/gtkdialogs.c:420
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../src/gtkdialogs.c:375
+#: ../gtk/gtkdialogs.c:438
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../src/gtkdialogs.c:595
-#: ../src/gtkdialogs.c:732
-#: ../src/gtkdialogs.c:795
-msgid "_Name"
-msgstr "_Ime"
-
-#: ../src/gtkdialogs.c:600
-#: ../src/gtkdialogs.c:737
-#: ../src/gtkdialogs.c:800
-msgid "_Account"
-msgstr "_Račun"
-
-#: ../src/gtkdialogs.c:608
-msgid "New Instant Message"
-msgstr "Novo neposredno sporočilo"
-
-#: ../src/gtkdialogs.c:610
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
-
-#: ../src/gtkdialogs.c:745
+#: ../gtk/gtkdialogs.c:812
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../src/gtkdialogs.c:747
+#: ../gtk/gtkdialogs.c:814
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si želite ogledati podatke."
 
-#: ../src/gtkdialogs.c:809
+#: ../gtk/gtkdialogs.c:903
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../src/gtkdialogs.c:811
+#: ../gtk/gtkdialogs.c:905
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri želite pridobiti dnevnik."
 
-#: ../src/gtkdialogs.c:830
+#: ../gtk/gtkdialogs.c:924
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../src/gtkdialogs.c:831
+#: ../gtk/gtkdialogs.c:925
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:833
-#: ../src/gtkdialogs.c:855
-#: ../src/gtkdialogs.c:875
-#: ../src/gtkrequest.c:277
-#: ../src/protocols/silc/chat.c:587
-msgid "Alias"
-msgstr "Psevdonim"
-
-#: ../src/gtkdialogs.c:851
+#: ../gtk/gtkdialogs.c:945
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../src/gtkdialogs.c:853
+#: ../gtk/gtkdialogs.c:947
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../src/gtkdialogs.c:872
+#: ../gtk/gtkdialogs.c:966
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../src/gtkdialogs.c:873
+#: ../gtk/gtkdialogs.c:967
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:910
+#: ../gtk/gtkdialogs.c:1004
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3884,225 +2852,318 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:918
+#: ../gtk/gtkdialogs.c:1012
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../src/gtkdialogs.c:919
+#: ../gtk/gtkdialogs.c:1013
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../src/gtkdialogs.c:970
+#: ../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 "Skupino %s boste spojili v skupino %s. Ali želite nadaljevati?"
+
+#: ../gtk/gtkdialogs.c:1050
+msgid "Merge Groups"
+msgstr "Spoji skupine"
+
+#: ../gtk/gtkdialogs.c:1051
+msgid "_Merge Groups"
+msgstr "_Spoji skupine"
+
+#: ../gtk/gtkdialogs.c:1101
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:973
+#: ../gtk/gtkdialogs.c:1104
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../src/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1105
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../src/gtkdialogs.c:1007
+#: ../gtk/gtkdialogs.c:1138
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../gtk/gtkdialogs.c:1141
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:1011
+#: ../gtk/gtkdialogs.c:1142
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:1032
+#: ../gtk/gtkdialogs.c:1163
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:1035
+#: ../gtk/gtkdialogs.c:1166
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../src/gtkdialogs.c:1036
+#: ../gtk/gtkdialogs.c:1167
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
-#: ../src/gtkft.c:133
+#: ../gtk/gtkdocklet.c:146
+msgid "Right-click for more unread messages...\n"
+msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
+
+#: ../gtk/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Spremeni stanje"
+
+#: ../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 "Na voljo"
+
+#. 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:1819
+#: ../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:4407
+#: ../libgaim/protocols/oscar/oscar.c:5474
+#: ../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 "Odsoten"
+
+#: ../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 "Neviden"
+
+#: ../gtk/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "Pokaži seznam prijateljev"
+
+#: ../gtk/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "Novo sporočilo ..."
+
+#: ../gtk/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Utišaj zvoke"
+
+#: ../gtk/gtkdocklet.c:543
+msgid "Blink on new message"
+msgstr "Utripaj ob novem sporočilu"
+
+#. 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 "Končaj"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:153
+#: ../gtk/gtkft.c:153
 msgid "Not started"
 msgstr "Ni zagnano"
 
-#: ../src/gtkft.c:162
-#: ../src/gtkft.c:1063
+#: ../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 "Neznan"
+
+#: ../gtk/gtkft.c:162
+#: ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "Končano"
 
-#: ../src/gtkft.c:165
-#: ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165
+#: ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../src/gtkft.c:168
-#: ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168
+#: ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:228
+#, fuzzy, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Kopiranje datotek postavitve ..."
+
+#: ../gtk/gtkft.c:233
+#: ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Prenosi datotek"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Sprejemam kot:</b>"
 
-#: ../src/gtkft.c:223
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Sprejemam od:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Pošiljam k:</b>"
 
-#: ../src/gtkft.c:229
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Pošiljam kot:</b>"
 
-#: ../src/gtkft.c:445
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: ../src/gtkft.c:450
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je prišlo do napake."
 
-#: ../src/gtkft.c:487
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: ../src/gtkft.c:496
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: ../src/gtkft.c:497
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: ../src/gtkft.c:591
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Potek"
 
-#: ../src/gtkft.c:598
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../src/gtkft.c:605
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Velikost"
 
-#: ../src/gtkft.c:612
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Preostanek"
 
-#: ../src/gtkft.c:643
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Datoteka:"
 
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "Lokalna datoteka:"
 
-#: ../src/gtkft.c:645
-msgid "Status:"
-msgstr "Stanje:"
-
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../src/gtkft.c:647
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Porabljen čas:"
 
-#: ../src/gtkft.c:648
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Preostali čas:"
 
-#: ../src/gtkft.c:710
-msgid "File Transfers"
-msgstr "Prenosi datotek"
-
-#: ../src/gtkft.c:733
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaključku _vseh prenosov"
 
-#: ../src/gtkft.c:743
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Počisti dokončane prenose"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:752
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
-#. Pause button
-#: ../src/gtkft.c:782
-#: ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Premor"
-
 #. Resume button
-#: ../src/gtkft.c:792
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: ../src/gtkimhtml.c:821
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: ../src/gtkimhtml.c:833
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Počisti oblikovanje"
 
-#: ../src/gtkimhtml.c:1327
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../src/gtkimhtml.c:1331
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../src/gtkimhtml.c:1332
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../src/gtkimhtml.c:1553
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../src/gtkimhtml.c:1565
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../src/gtkimhtml.c:1575
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../src/gtkimhtml.c:3272
+#: ../gtk/gtkimhtml.c:3298
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4112,7 +3173,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../src/gtkimhtml.c:3275
+#: ../gtk/gtkimhtml.c:3301
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4122,7 +3183,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../src/gtkimhtml.c:3288
+#: ../gtk/gtkimhtml.c:3314
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -4133,7 +3194,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3291
+#: ../gtk/gtkimhtml.c:3317
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4144,173 +3205,173 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3371
-#: ../src/gtkimhtml.c:3383
+#: ../gtk/gtkimhtml.c:3397
+#: ../gtk/gtkimhtml.c:3409
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../src/gtkimhtml.c:3411
+#: ../gtk/gtkimhtml.c:3437
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Nastavi barvo besedila"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Nastavi barvo ozadja"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Opis"
 
-#: ../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."
 msgstr "Vnesite URL in opis povezave, ki jo želite vstaviti. Opis ni obvezen."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: ../src/gtkimhtmltoolbar.c:513
-#: ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513
+#: ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Krepko"
 
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Ležeče"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Podčrtano"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Povečaj pisavo"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Manjša pisava"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
-msgstr "Tip pisave"
-
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Vrsta pisave"
+
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Barva pisave"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Barva ozadja"
 
-#: ../src/gtkimhtmltoolbar.c:1030
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "Počisti oblikovanje"
 
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Vstavi povezavo"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Vstavi sliko"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Vstavi smeškota"
 
-#: ../src/gtklog.c:207
+#: ../gtk/gtklog.c:219
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
 
-#: ../src/gtklog.c:212
+#: ../gtk/gtklog.c:224
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
 
-#: ../src/gtklog.c:261
+#: ../gtk/gtklog.c:273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:308
+#: ../gtk/gtklog.c:320
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
 
-#: ../src/gtklog.c:312
+#: ../gtk/gtklog.c:324
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
 
-#: ../src/gtklog.c:315
+#: ../gtk/gtklog.c:327
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
 
-#: ../src/gtklog.c:319
+#: ../gtk/gtklog.c:331
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: ../src/gtklog.c:398
+#: ../gtk/gtklog.c:410
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: ../src/gtklog.c:464
+#: ../gtk/gtklog.c:476
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: ../src/gtklog.c:472
-#: ../src/gtklog.c:523
+#: ../gtk/gtklog.c:484
+#: ../gtk/gtklog.c:535
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: ../src/gtklog.c:548
+#: ../gtk/gtklog.c:560
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poskusi '%s -h' za več informacij.\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4335,7 +3396,7 @@
 "                     določa račun(e) za prijavo, ločene z vejico)\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../src/gtkmain.c:492
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4371,28 +3432,15 @@
 "Podatki za stik z Seanom in Lukom prek drugih protokolov so na\n"
 "%scontactinfo.php.\n"
 
-#: ../src/gtknotify.c:329
-msgid "New Mail"
-msgstr "Nova e-pošta"
-
-#: ../src/gtknotify.c:345
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
 
-#: ../src/gtknotify.c:411
-#: ../src/protocols/jabber/jabber.c:1118
-msgid "From"
-msgstr "Od"
-
-#: ../src/gtknotify.c:420
-msgid "Subject"
-msgstr "Zadeva"
-
-#: ../src/gtknotify.c:429
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../src/gtknotify.c:495
+#: ../gtk/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -4401,7 +3449,7 @@
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: ../src/gtknotify.c:500
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4412,57 +3460,46 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../gtk/gtknotify.c:692
+#: ../libgaim/protocols/sametime/sametime.c:5450
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: ../src/gtknotify.c:844
-#: ../src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "Info for %s"
-msgstr "Podatki za %s"
-
-#: ../src/gtknotify.c:845
-#: ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Informacije o prijatelju"
-
-#: ../src/gtknotify.c:884
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Ukaz brskalnika \"%s\" ni veljaven."
 
-#: ../src/gtknotify.c:886
-#: ../src/gtknotify.c:898
-#: ../src/gtknotify.c:911
-#: ../src/gtknotify.c:1034
+#: ../gtk/gtknotify.c:892
+#: ../gtk/gtknotify.c:904
+#: ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: ../src/gtknotify.c:896
-#: ../src/gtknotify.c:909
+#: ../gtk/gtknotify.c:902
+#: ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Napaka pri zagonu \"%s\": %s"
 
-#: ../src/gtknotify.c:1035
+#: ../gtk/gtknotify.c:1046
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Odloženi bodo naslednji vstavki."
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Odloženih bo več vstavkov."
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Odloži vstavke"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4473,7 +3510,7 @@
 "<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
 "<span weight=\"bold\">Ime datoteke:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4484,416 +3521,464 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Napaka: %s\n"
 "Preverite spletno stran vstavka za posodobitev.</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "_Nastavi vstavek"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Podrobnosti o vstavku</b>"
 
-#: ../src/gtkpounce.c:154
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: ../src/gtkpounce.c:251
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: ../src/gtkpounce.c:495
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: ../src/gtkpounce.c:495
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:512
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../src/gtkpounce.c:539
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:565
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
-#: ../src/gtkpounce.c:573
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../src/gtkpounce.c:575
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../src/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../src/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:591
+#, fuzzy
+msgid "P_auses while typing"
+msgstr "Napaka pri dodajanju: "
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:621
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../src/gtkpounce.c:629
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../src/gtkpounce.c:631
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../src/gtkpounce.c:633
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../src/gtkpounce.c:635
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: ../src/gtkpounce.c:637
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../src/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../src/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../src/gtkpounce.c:645
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:757
-msgid "Options"
-msgstr "Možnosti"
-
-#: ../src/gtkpounce.c:765
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "_Opozori le tedaj, ko moje stanje ni na voljo"
 
-#: ../src/gtkpounce.c:770
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../src/gtkpounce.c:1074
+#: ../gtk/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: ../src/gtkpounce.c:1222
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-#: ../src/gtkpounce.c:1257
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
-#: ../src/gtkpounce.c:1304
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../src/gtkpounce.c:1431
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../src/gtkpounce.c:1433
+#: ../gtk/gtkpounce.c:1444
+#, fuzzy, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s vam (%s) je začel pisati"
+
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../src/gtkpounce.c:1435
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../src/gtkpounce.c:1437
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../src/gtkpounce.c:1439
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../src/gtkpounce.c:1441
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../src/gtkpounce.c:1443
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../src/gtkpounce.c:1445
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../src/gtkpounce.c:1447
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
 msgstr "Teme nasmeškov ni mogoče razpakirati."
 
-#: ../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."
 msgstr "S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove teme lahko namestite, če jih povlečete in spustite na seznam."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../src/gtkprefs.c:680
-#: ../src/protocols/jabber/buddy.c:286
-#: ../src/protocols/jabber/buddy.c:926
-#: ../src/protocols/jabber/chat.c:767
+#: ../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 "Opis"
 
-#: ../src/gtkprefs.c:821
-msgid "_Hide new IM conversations"
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Ikona na pladnju"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Pokaži sistemsko ikono na pladnju:"
+
+#: ../gtk/gtkprefs.c:819
+#: ../gtk/gtkprefs.c:831
+#: ../gtk/gtkprefs.c:1644
+#: ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "vedno"
+
+#: ../gtk/gtkprefs.c:820
+#: ../gtk/gtkprefs.c:829
+#: ../gtk/gtkprefs.c:1809
+#: ../gtk/gtkprefs.c:1823
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "nikoli"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Ob neprebranih sporočilih"
+
+#: ../gtk/gtkprefs.c:826
+#, fuzzy
+msgid "Conversation Window Hiding"
+msgstr "Dodaj okno tabele"
+
+#: ../gtk/gtkprefs.c:827
+#, fuzzy
+msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM"
 
-#: ../src/gtkprefs.c:824
-#: ../src/gtkprefs.c:1779
+#: ../gtk/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:1824
 msgid "When away"
 msgstr "ob odsotnosti"
 
-#: ../src/gtkprefs.c:828
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Pošlji neznane ukaze \"_slash\" kot sporočila"
-
-#: ../src/gtkprefs.c:830
-msgid "Show _formatting on incoming messages"
-msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
-
-#: ../src/gtkprefs.c:833
-msgid "Show buddy _icons"
-msgstr "Prikaži _ikone"
-
-#: ../src/gtkprefs.c:835
-msgid "Enable buddy ic_on animation"
-msgstr "_Omogoči animacijo ikon prijateljev"
-
-#: ../src/gtkprefs.c:842
-msgid "_Notify buddies that you are typing to them"
-msgstr "O_bvesti prijatelje, da jim pišem"
-
-#: ../src/gtkprefs.c:845
-msgid "Highlight _misspelled words"
-msgstr "_Obarvaj nepravilno črkovane besede"
-
-#: ../src/gtkprefs.c:849
-msgid "Use smooth-scrolling"
-msgstr "Uporabi animirano drsenje"
-
-#: ../src/gtkprefs.c:865
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje. :)"
-
 #. All the tab options!
-#: ../src/gtkprefs.c:887
-msgid "Tab Options"
-msgstr "Možnosti zavihkov"
-
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Zavihki"
+
+#: ../gtk/gtkprefs.c:840
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži pogovore v _oknih z zavihki"
 
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:854
 msgid "Show close b_utton on tabs"
 msgstr "Pokaži _gumb 'Zapri' na zavihkih"
 
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:857
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:859
 msgid "Top"
 msgstr "zgoraj"
 
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:860
 msgid "Bottom"
 msgstr "spodaj"
 
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:861
 msgid "Left"
 msgstr "na levi"
 
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:862
 msgid "Right"
 msgstr "na desni"
 
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:864
 msgid "Left Vertical"
 msgstr "levo navpično"
 
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:865
 msgid "Right Vertical"
 msgstr "desno navpično"
 
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:872
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: ../src/gtkprefs.c:973
-#: ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:3631
+#: ../gtk/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
+
+#: ../gtk/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Prikaži _ikone"
+
+#: ../gtk/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "_Omogoči animacijo ikon prijateljev"
+
+#: ../gtk/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "O_bvesti prijatelje, da jim pišem"
+
+#: ../gtk/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "_Obarvaj nepravilno črkovane besede"
+
+#: ../gtk/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Uporabi animirano drsenje"
+
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Privzeto oblikovanje"
+
+#: ../gtk/gtkprefs.c:941
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje. :)"
+
+#: ../gtk/gtkprefs.c:1010
+#: ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3628
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:1012
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../src/gtkprefs.c:987
+#: ../gtk/gtkprefs.c:1024
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#: ../src/gtkprefs.c:991
+#: ../gtk/gtkprefs.c:1028
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../src/gtkprefs.c:1000
+#: ../gtk/gtkprefs.c:1037
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../src/gtkprefs.c:1029
+#: ../gtk/gtkprefs.c:1066
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../src/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1069
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1072
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: ../src/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1079
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: ../src/gtkprefs.c:1050
+#: ../gtk/gtkprefs.c:1087
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: ../src/gtkprefs.c:1054
+#: ../gtk/gtkprefs.c:1091
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: ../src/gtkprefs.c:1110
+#: ../gtk/gtkprefs.c:1147
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../src/gtkprefs.c:1172
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1173
+#: ../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"
+
+#: ../gtk/gtkprefs.c:1214
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1215
+msgid "GNOME Default"
+msgstr "Privzeto za GNOME"
+
+#: ../gtk/gtkprefs.c:1216
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1217
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1218
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1174
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1175
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1176
-msgid "GNOME Default"
-msgstr "Privzeto za GNOME"
-
-#: ../src/gtkprefs.c:1177
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../src/gtkprefs.c:1178
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../src/gtkprefs.c:1179
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1180
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1219
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1228
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1281
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../src/gtkprefs.c:1246
+#: ../gtk/gtkprefs.c:1285
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../src/gtkprefs.c:1254
+#: ../gtk/gtkprefs.c:1293
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../src/gtkprefs.c:1256
+#: ../gtk/gtkprefs.c:1295
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../src/gtkprefs.c:1257
+#: ../gtk/gtkprefs.c:1296
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../src/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1298
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../src/gtkprefs.c:1273
+#: ../gtk/gtkprefs.c:1312
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4902,85 +3987,80 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../src/gtkprefs.c:1309
-#: ../src/gtkprefs.c:1890
-msgid "Logging"
-msgstr "Beleženje v dnevnik"
-
-#: ../src/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1352
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../src/gtkprefs.c:1317
+#: ../gtk/gtkprefs.c:1357
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../src/gtkprefs.c:1319
+#: ../gtk/gtkprefs.c:1359
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../src/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1361
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../src/gtkprefs.c:1469
+#: ../gtk/gtkprefs.c:1509
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../src/gtkprefs.c:1477
+#: ../gtk/gtkprefs.c:1517
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1519
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../src/gtkprefs.c:1481
+#: ../gtk/gtkprefs.c:1521
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../src/gtkprefs.c:1483
-#: ../src/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1523
+#: ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Navadno"
 
-#: ../src/gtkprefs.c:1485
+#: ../gtk/gtkprefs.c:1525
 msgid "Loud"
 msgstr "glasno"
 
-#: ../src/gtkprefs.c:1487
+#: ../gtk/gtkprefs.c:1527
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1529
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../src/gtkprefs.c:1552
+#: ../gtk/gtkprefs.c:1592
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: ../src/gtkprefs.c:1553
+#: ../gtk/gtkprefs.c:1593
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../src/gtkprefs.c:1555
+#: ../gtk/gtkprefs.c:1595
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../src/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1597
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1602
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../src/gtkprefs.c:1563
+#: ../gtk/gtkprefs.c:1603
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../src/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1611
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4989,202 +4069,214 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../src/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1637
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: ../src/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1638
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../src/gtkprefs.c:1600
-msgid "_Sounds while away"
-msgstr "_Zvoki, kadar sem odsoten"
-
-#: ../src/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1640
+msgid "Enable sounds:"
+msgstr "Omogoči zvoke:"
+
+#: ../gtk/gtkprefs.c:1642
+msgid "Only when available"
+msgstr "Samo ko je na voljo"
+
+#: ../gtk/gtkprefs.c:1643
+msgid "Only when not available"
+msgstr "Samo ko ni na voljo"
+
+#: ../gtk/gtkprefs.c:1651
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../src/gtkprefs.c:1635
+#: ../gtk/gtkprefs.c:1679
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1730
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../src/gtkprefs.c:1693
+#: ../gtk/gtkprefs.c:1737
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../src/gtkprefs.c:1712
+#: ../gtk/gtkprefs.c:1756
 msgid "Test"
 msgstr "Preskus"
 
-#: ../src/gtkprefs.c:1716
+#: ../gtk/gtkprefs.c:1760
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../src/gtkprefs.c:1720
+#: ../gtk/gtkprefs.c:1764
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: ../src/gtkprefs.c:1762
+#: ../gtk/gtkprefs.c:1807
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1810
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: ../src/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1812
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../src/gtkprefs.c:1776
+#: ../gtk/gtkprefs.c:1821
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../src/gtkprefs.c:1780
+#: ../gtk/gtkprefs.c:1825
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1786
+#: ../gtk/gtkprefs.c:1831
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../src/gtkprefs.c:1788
+#: ../gtk/gtkprefs.c:1833
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../src/gtkprefs.c:1792
+#: ../gtk/gtkprefs.c:1837
 msgid "_Minutes before changing status:"
 msgstr "Število _minut pred spremembo stanja:"
 
-#: ../src/gtkprefs.c:1800
+#: ../gtk/gtkprefs.c:1845
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1821
-msgid "Status at startup"
+#: ../gtk/gtkprefs.c:1866
+msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
 
-#: ../src/gtkprefs.c:1823
+#: ../gtk/gtkprefs.c:1868
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../src/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1874
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../src/gtkprefs.c:1880
+#: ../gtk/gtkprefs.c:1912
+msgid "Interface"
+msgstr "Vmesnik"
+
+#: ../gtk/gtkprefs.c:1914
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../src/gtkprefs.c:1881
+#: ../gtk/gtkprefs.c:1915
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../src/gtkprefs.c:1882
-#: ../src/protocols/silc/silc.c:1850
+#: ../gtk/gtkprefs.c:1916
+#: ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../src/gtkprefs.c:1887
+#: ../gtk/gtkprefs.c:1921
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../src/gtkprefs.c:1891
-msgid "Away / Idle"
-msgstr "Odsotnost / Nedejavnost"
-
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprefs.c:1925
+msgid "Status / Idle"
+msgstr "Stanje / Nedejaven"
+
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Dovoli vsem uporabnikom, da stopijo v stik z mano"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Dovoli le uporabnikom na mojem seznamu prijateljev"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Dovoli samo spodnjim uporabnikom"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Zavrni vse uporabnike"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Zavrni samo uporabnike spodaj"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Spremembe nastavitev o zasebnosti stopijo v veljavo takoj."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: ../src/gtkprivacy.c:562
-#: ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560
+#: ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Vpišite uporabnika, ki mu želiš dovoliti, da stopi v stik z vami."
 
-#: ../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 "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
 
-#: ../src/gtkprivacy.c:567
-#: ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565
+#: ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Dovoli"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dovoli %s, da stopi v stik z vami?"
 
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepričani, da želite dovoliti %s, da stopi v stik z vami?"
 
-#: ../src/gtkprivacy.c:601
-#: ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599
+#: ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Vpišite uporabnika, ki ga želite zavrniti."
 
-#: ../src/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga želite zavrniti."
 
-#: ../src/gtkprivacy.c:605
-#: ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Zavrnem %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepričani, da želite zavrniti %s?"
@@ -5192,331 +4284,245 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267
-#: ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566
-#: ../src/protocols/novell/novell.c:1919
-#: ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117
-#: ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../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 "Da"
 
-#: ../src/gtkrequest.c:268
-#: ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566
-#: ../src/protocols/novell/novell.c:1920
-#: ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118
-#: ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../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 "Ne"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "Uporabi"
 
-#: ../src/gtkrequest.c:272
-#: ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:350
-msgid "Close"
-msgstr "Zapri"
-
-#: ../src/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
 msgstr "Izberite novo ime"
 
-#: ../src/gtkrequest.c:1512
-#: ../src/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1512
+#: ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: ../src/gtkrequest.c:1513
-#: ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513
+#: ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: ../src/gtkrequest.c:1601
-#: ../src/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1601
+#: ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
 msgstr "Izberite mapo ..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Seznam sob"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "_Dodaj pomenek"
 
-#: ../src/gtksavedstatuses.c:433
-#: ../src/protocols/jabber/buddy.c:283
-#: ../src/protocols/jabber/buddy.c:920
-#: ../src/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "Naziv"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Vrsta"
-
-#: ../src/gtksavedstatuses.c:459
-#: ../src/gtksavedstatuses.c:919
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263
-#: ../src/protocols/gg/gg.c:1591
-#: ../src/protocols/gg/gg.c:1601
-#: ../src/protocols/gg/gg.c:1607
-#: ../src/protocols/gg/gg.c:1616
-#: ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227
-#: ../src/protocols/jabber/jabber.c:1185
-#: ../src/protocols/jabber/jabber.c:1195
-#: ../src/protocols/jabber/jabber.c:1205
-#: ../src/protocols/jabber/jabber.c:1215
-#: ../src/protocols/jabber/jabber.c:1225
-#: ../src/protocols/jabber/jabber.c:1237
-#: ../src/protocols/novell/novell.c:2866
-#: ../src/protocols/novell/novell.c:2972
-#: ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984
-#: ../src/protocols/oscar/oscar.c:5362
-#: ../src/protocols/oscar/oscar.c:5377
-#: ../src/protocols/oscar/oscar.c:5382
-#: ../src/protocols/oscar/oscar.c:5590
-#: ../src/protocols/oscar/oscar.c:5602
-#: ../src/protocols/sametime/sametime.c:3266
-#: ../src/protocols/sametime/sametime.c:3272
-#: ../src/protocols/sametime/sametime.c:3278
-#: ../src/protocols/sametime/sametime.c:3357
-#: ../src/protocols/silc/buddy.c:1544
-#: ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3282
-#: ../src/protocols/yahoo/yahoo.c:3288
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "Sporočilo"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Shranjena stanja"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549
-#: ../src/gtksavedstatuses.c:1179
+#: ../gtk/gtksavedstatuses.c:549
+#: ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je že v uporabi. Prosimo, izberite drug naziv."
 
-#: ../src/gtksavedstatuses.c:879
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Razno"
 
-#: ../src/gtksavedstatuses.c:908
-#: ../src/gtksavedstatuses.c:1055
-#: ../src/protocols/gg/gg.c:1024
-#: ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578
-#: ../src/protocols/jabber/buddy.c:629
-#: ../src/protocols/jabber/buddy.c:636
-#: ../src/protocols/jabber/buddy.c:662
-#: ../src/protocols/jabber/jabber.c:1156
-#: ../src/protocols/msn/msn.c:548
-#: ../src/protocols/novell/novell.c:2865
-#: ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:775
-#: ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784
-#: ../src/protocols/yahoo/yahoo.c:2878
-msgid "Status"
-msgstr "Stanje"
-
-#: ../src/gtksavedstatuses.c:1072
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../src/gtksavedstatuses.c:1091
-#: ../src/gtksavedstatuses.c:1412
+#: ../gtk/gtksavedstatuses.c:1095
+#: ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1123
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi _različno stanje"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1187
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: ../src/gtksavedstatuses.c:1393
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
-#: ../src/gtksound.c:59
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: ../src/gtksound.c:60
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Sporočilo prejeto"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Prejeto sporočilo začne pogovor"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Oseba se pridruži pogovorni sobi"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Oseba zapusti pogovorno sobo"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: ../src/gtksound.c:70
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
+#: ../gtk/gtksound.c:310
+#, fuzzy
+msgid "GStreamer Failure"
+msgstr "Shrani datoteko"
+
+#: ../gtk/gtksound.c:311
+#, fuzzy
+msgid "GStreamer failed to initialize."
+msgstr "Teme nasmeškov ni mogoče razpakirati."
+
 #. connect to the server
-#: ../src/gtkstatusbox.c:368
-#: ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:983
-#: ../src/protocols/msn/session.c:344
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2181
-#: ../src/protocols/oscar/oscar.c:1250
-#: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1609
-#: ../src/protocols/yahoo/yahoo.c:2570
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../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 "Povezovanje"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Psevdonim"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Zapri _zavihke"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Informacije"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "Povab_i"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Spremeni"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Odpri pošto"
-
-#: ../src/gtkutils.c:1306
-#: ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:545
+#, fuzzy
+msgid "Waiting for network connection"
+msgstr "Čakanje na začetek prenosa"
+
+#: ../gtk/gtkutils.c:1310
+#: ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: ../src/gtkutils.c:1308
-#: ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1313
+#: ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati imenika %s."
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1412
 msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
 msgstr "Gaim ne more prenesti imenika. Datoteke boste morali poslati posamično."
 
-#: ../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 "Povlekli ste sliko"
 
-#: ../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."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali uporabite kot ikono za tega uporabnika."
 
-#: ../src/gtkutils.c:1443
-#: ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1445
+#: ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: ../src/gtkutils.c:1444
-#: ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1446
+#: ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: ../src/gtkutils.c:1445
-#: ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1447
+#: ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: ../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."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali jo uporabite kot ikono za tega uporabnika."
 
-#: ../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"
 msgstr "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
@@ -5525,133 +4531,2187 @@
 #. * 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 "Ni mogoče poslati zaganjalnika"
 
-#: ../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."
 msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
 
-#: ../src/gtkwhiteboard.c:756
-#: ../src/gtkwhiteboard.c:775
+#: ../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>Datoteka:</b> %s\n"
+"<b>Velikost:</b> %s\n"
+"<b>Velikost slike:</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 "Ikona prijatelja"
+
+#: ../gtk/gtkutils.c:2733
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Datoteke '%s' ni mogoče odpreti: %s"
+
+#: ../gtk/gtkutils.c:2782
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../gtk/gtkwhiteboard.c:756
+#: ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "Shrani datoteko"
 
-#: ../src/gtkwhiteboard.c:863
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "Izberite barvo"
 
-#: ../src/log.c:180
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "Pokaži statistiko"
+
+#: ../gtk/plugins/cap/cap.c:458
+#: ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "Verjetnost odgovora:"
+
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "Prilagoditev statistike"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+#, fuzzy
+msgid "Maximum response timeout:"
+msgstr "najdi največjo vrednost <FIELD>"
+
+#: ../gtk/plugins/cap/cap.c:813
+#: ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+msgid "minutes"
+msgstr "minut"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "Prag:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  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 ""
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Prijatelj je nedejaven"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Prijatelj je odsoten"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Prijatelj je \"podaljšano\" odsoten"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Prijatelj je mobilen"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Prijatelj ni na zvezi"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Vrednosti točk, ko ..."
+
+#: ../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 "Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Uporabi zadnjega prijatelja, ko so rezultati poravnani"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Vrednosti točk za račun ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Prednost stika"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
+
+#. *< 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 "Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Po številu pomenkov"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Postavitev pomenkov"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Število pomenkov v oknu"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Pri postavitvi po številu loči okna za klepet in zasebni pomenek"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "Postavitev"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Dodatne možnosti postavitve pomenka."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in zasebni pomenek"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim predstavitveni vstavek"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Vzorčni vstavek, ki počne razne stvari - oglejte si opis."
+
+#. *  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 ""
+"To je resnično carski vstavek, ki naredi dosti stvari:\n"
+"- ko se prijavite, pove kdo je napisal ta program;\n"
+"- prikaže vsa prispela sporočila črkovana nazaj;\n"
+"- pošlje sporočilo prijateljem na vašem seznamu, takoj ko se prijavijo;"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Barva kazalke"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Drugotna barva kazalke"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Barva povezave"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Velikost razširnika GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Vodoravno ločilo GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Vnos pogovora"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Zgodovina pogovora"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Ogledovalnik dnevnika"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Pogovorno okno zahteve"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Pogovorno okno obvestila"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Razširniki zamika GtkTreeView"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Nastavite barvo za %s"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Nastavite barvo"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Nastavite pisavo za %s"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Nastavite pisavo vmesnika"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "Splošno"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "Pisava vmesnika GTK+"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "Tema bližnjic besedila GTK+"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Barve vmesnika"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Velikosti gradnikov"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Pisave"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Orodja"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Ponovno preberi datoteke gtkrc"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Nadzor teme Gaim GTK+"
+
+#: ../gtk/plugins/gaimrc.c:618
+#: ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Nastavitve gest miške"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Srednja miškina tipka"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Desna miškina tipka"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Viden prikaz gest"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Miškine geste"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Omogoča podporo za geste miške"
+
+#. *  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 ""
+"Omogoča podporo za geste miške v pogovornih oknih.\n"
+"Povlecite s srednjo miškino tipko, da storite naslednje:\n"
+"\n"
+"Povlecite navzdol in zatem desno, da končate pogovor.\n"
+"Povlecite navzgor in zatem levo, da se vrnete k prejšnjemu pogovoru.\n"
+"Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Neposredno sporočanje"
+
+#. 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 "Izberite osebo iz vašega imenika spodaj ali dodajte novo."
+
+#. "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:6086
+#: ../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 "Išči"
+
+#. "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 "Nova oseba"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Izberi prijatelja"
+
+#. 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 "Izberite osebo iz vašega imenika, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Podrobnosti _o uporabniku"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "Pridruži prijatelj_a"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1145
+msgid "None"
+msgstr "brez"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "Unable to send e-mail"
+msgstr "E-sporočila ni mogoče poslati."
+
+#: ../gtk/plugins/gevolution/gevolution.c:264
+msgid "The evolution executable was not found in the PATH."
+msgstr "Izvršilne datoteke Evolution ni v POTI."
+
+#: ../gtk/plugins/gevolution/gevolution.c:270
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "Navedenega prijatelja ni med stiki v Evolution."
+
+#: ../gtk/plugins/gevolution/gevolution.c:287
+msgid "Add to Address Book"
+msgstr "Dodaj v imenik"
+
+#: ../gtk/plugins/gevolution/gevolution.c:291
+msgid "Send E-Mail"
+msgstr "Pošlji e-sporočilo"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:418
+msgid "Evolution Integration Configuration"
+msgstr "Nastavitve integracije z Evolutionom"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:421
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:528
+msgid "Evolution Integration"
+msgstr "Integracija z Evolutionom"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:531
+#: ../gtk/plugins/gevolution/gevolution.c:533
+msgid "Provides integration with Evolution."
+msgstr "Omogoča integracijo z Evolutionom."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Spodaj vnesite podatke o osebi."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Spodaj vnesite prijateljev vzdevek in vrsto računa."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Vrsta računa:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Dodatne informacije:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Ime:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Priimek:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-pošta:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Preskus signalov GTK"
+
+#. *< 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 "Preveri pravilnost delovanja vseh signalov uporabniškega vmesnika."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "Zgodovina"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Pomanjšaj, ko sem odsoten"
+
+#. *< 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 "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Preverjevalnik pošte"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Preveri morebitno novoprispelo pošto."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za sprejem."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Seja glasbenega sporočanja potrjena."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "Glasbeno sporočanje"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Pri zaganjanju ukaza je prišlo do napake:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Napaka pri uporabi urejevalnika"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+#, fuzzy
+msgid "The following error has occurred:"
+msgstr "V čarovniku je prišlo do nepričakovane napake."
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "Nastavitve glasbe sporočanja"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "Pot urejevalnika partiture"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "Upor_abi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
+
+#. *  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 "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Obveščaj o"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "Okna za _neposredne pogovore"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "_Pogovorna okna"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Le ko nekdo omeni vaše ime v sobi"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "Okna, ki imajo _fokus"
+
+#  ---------- "Notification Methods" ----------
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "Načini obveščanja"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Dodaj _obvestilo v naslov okna:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Prikaži _število novih sporočil v naslovu okna"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+#, fuzzy
+msgid "Insert count of new message into _X property"
+msgstr "Prikaži _število novih sporočil v naslovu okna"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "Povzdigni pogovorna okn_a"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Odstranjevanje obvestil"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Odstrani, ko pogovorno okno _dobi fokus"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Odstrani, ko _kliknem na pogovorno okno"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Odstrani, ko _tipkam v pogovornem oknu"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Odstrani, ko je _sporočilo poslano"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "Odstrani ob zamenjavi _zavihka pomenka"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Obvestila o sporočilih"
+
+#. *< 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 "Ponuja mnoge načine opozarjanja na nova sporočila."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Direktno"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Omogoča neposreden vnos v protokole."
+
+#: ../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 "Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte kodno okno."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Uporabljate Gaim različice %s.  Trenutna različica je %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Dnevnik sprememb:</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 "Različico %s lahko najdete na:<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 "Na voljo je nova različica."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Obvestilo o izdaji"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Preverjaj, ali je na voljo nova različica."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
+
+#: ../gtk/plugins/spellchk.c:1963
+msgid "Duplicate Correction"
+msgstr "Popravek dvojnikov"
+
+#: ../gtk/plugins/spellchk.c:1964
+msgid "The specified word already exists in the correction list."
+msgstr "Navedena beseda že obstaja v seznamu popravkov."
+
+#: ../gtk/plugins/spellchk.c:2172
+msgid "Text Replacements"
+msgstr "Zamenjave besedila"
+
+#: ../gtk/plugins/spellchk.c:2195
+msgid "You type"
+msgstr "Vi napišete"
+
+#: ../gtk/plugins/spellchk.c:2209
+msgid "You send"
+msgstr "Jaz pošljem"
+
+#: ../gtk/plugins/spellchk.c:2223
+msgid "Whole words only"
+msgstr "Samo cele besede"
+
+#: ../gtk/plugins/spellchk.c:2235
+msgid "Case sensitive"
+msgstr "Razlikuj velike in male črke"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "Add a new text replacement"
+msgstr "Dodaj novo zamenjavo"
+
+#: ../gtk/plugins/spellchk.c:2277
+msgid "You _type:"
+msgstr "Vi _napišete:"
+
+#: ../gtk/plugins/spellchk.c:2294
+msgid "You _send:"
+msgstr "Jaz _pošljem:"
+
+#. 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 "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
+
+#: ../gtk/plugins/spellchk.c:2308
+msgid "Only replace _whole words"
+msgstr "Zamenjaj le _cele besede"
+
+#: ../gtk/plugins/spellchk.c:2333
+msgid "General Text Replacement Options"
+msgstr "Splošne možnosti zamenjave besedila"
+
+#: ../gtk/plugins/spellchk.c:2334
+msgid "Enable replacement of last word on send"
+msgstr "Omogoči zamenjavo zadnje besede pri pošiljanju"
+
+#: ../gtk/plugins/spellchk.c:2359
+msgid "Text replacement"
+msgstr "Zamenjava besedila"
+
+#: ../gtk/plugins/spellchk.c:2361
+#: ../gtk/plugins/spellchk.c:2362
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77
+#: ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Nabodalo prijateljev"
+
+#. *< 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 "Vodoravna inačica seznama prijateljev."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "Časovni žig iChat"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Zakasnitev"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minut."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Čas nastanka"
+
+#. *< 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 "Doda čase nastanka vsakih N minut v slogu iChata."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Možnosti zapisa časovnega žiga"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Prisili (tradicionalni Gaim) 24-urni časovni zapis"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Pokaži datume v ..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Po_govori:"
+
+#: ../gtk/plugins/timestamp_format.c:37
+#: ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Za zakasnjena sporočila"
+
+#: ../gtk/plugins/timestamp_format.c:38
+#: ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Za zakasnjena sporočila in v pogovorih"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Dnevniki _sporočil:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Zapisi časovnega žiga sporočil"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Prilagodi oblike časovnega žiga sporočil po meri."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Neprosojnost:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Pogovorna okna"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "Pro_sojnost pogovornega okna"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "_Prikaži drsno vrstico v pogovornem oknu"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Odstrani prosojnost pogovornega okna v ospredju"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Vedno na vrhu"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Seznam prijateljev"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "_Prosojnost seznama prijateljev"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Prosojnost"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Poljubna prosojnost seznama prijateljev in pomenkov."
+
+#. *  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 ""
+"Ta vstavek omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
+"\n"
+"* Pozor: Ta vstavek zahteva Win2000 ali novejše."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "Nastavitve GTK+"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "Zagon"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "Za_ženi Gaim ob zagonu Windows"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "Le_pljiv seznam prijateljev"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "_Ohrani seznam prijateljev nad vrhu:"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "samo, ko je lepljiv"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+#, fuzzy
+msgid "_Flash window when chat messages are received"
+msgstr "Utrip_aj z oknom, ko prispe novo sporočilo"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "Možnosti Gaim za Windows"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Nastavitve, specifične za okolje Windows."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+#, fuzzy
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "Računi"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "Za prijavo je potrebno geslo."
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Vpišite geslo za %s (%s)"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "Vnesi geslo"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "Shrani geslo"
+
+#: ../libgaim/account.c:989
+#: ../libgaim/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Manjka vstavek za protokol %s"
+
+#: ../libgaim/account.c:1071
+#: ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1295
+msgid "New passwords do not match."
+msgstr "Novi gesli se ne ujemata."
+
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "Izpolnite vsa polja."
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "Obstoječe geslo"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "Novo geslo"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "Novo geslo (ponovno)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "Spremeni geslo za %s"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "Vnesite svoje obstoječe in novo geslo."
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "Spremeni podatke za uporabika %s"
+
+#: ../libgaim/account.c:1164
+#: ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Nastavi informacije o uporabniku"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "Seznam prijateljev"
+
+#: ../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 prijateljev iz skupine %s ni bilo odstranjenih, ker pripadajo računom, ki so trenutno onemogočeni ali niso prijavljeni.  Niti prijatelji niti skupine niso bili odstranjeni.\n"
+msgstr[1] "%d prijatelj iz skupine %s ni bil odstranjen, ker pripada računu, ki je trenutno onemogočen ali ni prijavljen.  Niti prijatelj niti skupina nista bila odstranjena.\n"
+msgstr[2] "%d prijatelja iz skupine %s nista bila odstranjena, ker pripadata računoma, ki sta trenutno onemogočena ali nista prijavljena.  Niti prijatelja niti skupina niso bili odstranjeni.\n"
+msgstr[3] "%d prijatelji iz skupine %s niso bili odstranjeni, ker pripadajo računom, ki so trenutno onemogočeni ali niso prijavljeni.  Niti prijatelji niti skupine niso bili odstranjeni.\n"
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "Skupina ni bila odstranjena"
+
+#: ../libgaim/connection.c:106
+msgid "Registration Error"
+msgstr "Napaka pri prijavi"
+
+#: ../libgaim/connection.c:292
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s se je prijavil(a)"
+
+#: ../libgaim/connection.c:325
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s se je odjavil(a)"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Sporočila ni mogoče poslati, ker je preveliko."
+
+#: ../libgaim/conversation.c:168
+#: ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Sporočila k %s ni mogoče poslati."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "Sporočilo je preveliko."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Sporočila ni mogoče poslati."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "Pošlji sporočilo"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "_Pošlji sporočilo"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s se nam pridružuje."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] se nam pridružuje."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Zdaj ste znani kot %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s je zdaj poznan kot %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s nas je zapustil."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s nas je zapustil (%s)."
+
+#: ../libgaim/desktopitem.c:286
+#: ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Brez imena"
+
+#: ../libgaim/dbus-server.c:577
+#, fuzzy, c-format
+msgid "Failed to get connection: %s"
+msgstr "Ni bilo mogoče ustvariti povezave"
+
+#: ../libgaim/dbus-server.c:585
+#, fuzzy, c-format
+msgid "Failed to get name: %s"
+msgstr "Slike: %s ni mogoče shraniti.\n"
+
+#: ../libgaim/dbus-server.c:598
+#, fuzzy, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Slike: %s ni mogoče shraniti.\n"
+
+#: ../libgaim/dnsquery.c:490
+#, fuzzy
+msgid "Unable to create new resolver process\n"
+msgstr "Ni mogoče ustvariti vtičnice"
+
+#: ../libgaim/dnsquery.c:495
+#, fuzzy
+msgid "Unable to send request to resolver process\n"
+msgstr "Sporočila k %s ni mogoče poslati."
+
+#: ../libgaim/dnsquery.c:528
+#: ../libgaim/dnsquery.c:676
+#, fuzzy, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr "Nepričakovana napaka"
+
+#: ../libgaim/dnsquery.c:531
+#: ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, fuzzy, c-format
+msgid "Error resolving %s: %d"
+msgstr "Nepričakovana napaka"
+
+#: ../libgaim/dnsquery.c:553
+#, fuzzy, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr "Napaka pri branju iz vtičnice: %s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr ""
+
+#: ../libgaim/dnsquery.c:734
+#, fuzzy, c-format
+msgid "Thread creation failure: %s"
+msgstr "Napaka pri overovitvi"
+
+#: ../libgaim/dnsquery.c:735
+msgid "Unknown reason"
+msgstr "Neznan razlog"
+
+#: ../libgaim/ft.c:189
+#: ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Napaka pri branju %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Napaka pri pisanju na strežnik %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Napaka pri dostopu do %s: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "Datoteke z 0 bajti ni mogoče poslati."
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "Imenika ni mogoče poslati."
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s vam želi poslati %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s vam želi poslati datoteko"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Sprejmete zahtevo po prenosu datoteke od %s?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Na voljo je datoteka za prenos iz:\n"
+"Oddaljen gostitelj: %s\n"
+"Oddaljena vrata: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s ponuja pošiljanje datoteke %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s ni veljavna datoteka.\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Ponujeno pošiljanje sporočila %s k %s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Začetek prenosa %s od %s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Prenos datoteke %s je dokončan."
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Prenos datoteke je dokončan."
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Prekinili ste prenos %s"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Prenos datoteke je preklican"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s je prekinil prenos %s"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s je prekinil prenos datoteke"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Prenos datoteke do %s ni uspel."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Prenos datoteke od %s ni uspel."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Zaženi ukaz v sistemskem oknu"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr ""
+
+#: ../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 ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: ../src/log.c:561
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:572
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: ../src/log.c:583
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "Stari Gaim"
 
-#: ../src/log.c:678
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: ../src/log.c:1028
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1102
+#: ../libgaim/log.c:1115
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1104
+#: ../libgaim/log.c:1117
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1162
-#: ../src/log.c:1294
+#: ../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>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: ../src/log.c:1174
-#: ../src/log.c:1308
+#: ../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>Ni mogoče brati datoteke: %s</b></font>"
 
-#: ../src/log.c:1236
+#: ../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/jabber/buddy.c:1645
-#: ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:321
-#: ../src/protocols/oscar/oscar.c:2701
+#: ../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:2678
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Neustrezna %d vstavka (potrebuje %d)"
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Neustrezna različica ABI %d.%d.x (potrebna je %d.%d.x)"
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "Vstavek ne vsebuje implementacije vseh potrebnih funkcij"
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:533
 #, c-format
 msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Ob nalaganju vstavka je prišlo do napak."
 
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega dodatka %s se ni dalo naložiti."
 
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ni mogel naložiti vašega dodatka."
 
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Odvisnega vstavka %s ni bilo mogoče odložiti."
 
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Pri odlaganju vstavka je prišlo do napake."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "Primer DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158
+#: ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "Primer vstavka DBus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Nadzor datotek Gaim"
+
+#. *< 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 "Omogoča nadzor nad Gaimom z vnašanjem ukazov v datoteko."
+
+#: ../libgaim/plugins/idle.c:158
+#: ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "minut"
+
+#. 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 "NedejavniK"
+
+#: ../libgaim/plugins/idle.c:166
+#: ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Nastavi čas nedejavnosti"
+
+#: ../libgaim/plugins/idle.c:169
+#: ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Nastavi"
+
+#: ../libgaim/plugins/idle.c:170
+#: ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Noben od vaših računov ni nedejaven."
+
+#: ../libgaim/plugins/idle.c:199
+#: ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Odnastavi čas nedejavnosti"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Odnastavi"
+
+#: ../libgaim/plugins/idle.c:224
+#: ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Nastavi čas nedejavnosti za vse račune"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
+
+#: ../libgaim/plugins/idle.c:317
+#: ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "Preskusni odjemalec IPC"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Preskusite vstavek s podporo IPC, kot odjemalec."
+
+#. *  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 "Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek in kliče registrirane ukaze."
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Preskusni strežnik IPC"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Preskusite vstavek s podporo IPC, kot strežnik."
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "Uporabnik ni na zvezi."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Samodejni odgovor poslan:"
+
+#: ../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 se je odjavil(a)."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "Eno ali več sporočil ni mogoče dostaviti."
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Povezava s strežnikom je bila prekinjena."
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne povežete."
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Sporočila ni mogoče poslati, saj je presežena največja dolžina."
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "Sporočila ni mogoče poslati."
+
+#. 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 "Splošne nastavitve ogledovanja dnevnika"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "Hitri izračuni velikosti"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr "Uporabi hevristiko imena"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Imenik dnevnika"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Ogledovalnik dnevnika"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+#, fuzzy
+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 "Pri ogledovanju dnevnikov bo ta vstavek vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Nalaganje vstavkov Mono"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Naloži vstavke .NET skupaj z Mono."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Nalagalnik vstavkov Perl"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590
+#: ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Telepatski način"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "Telepatski način za dohodne pogovore"
+
+#: ../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 "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, Jabber, Sametime in 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 "Občutite motnjo v Moči (saj veste, Vojna zvezd) ..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Dovoli le uporabnikom s seznama prijateljev"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Onemogoči ob odsotnosti"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Prikaži obvestilno sporočilo v pogovorih"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Preskus signalov"
+
+#. *< 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 "Preveri vse ukaze, da se prepriča o delujoči povezavi."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Enostavni vstavek"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40
+#: ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Preveri večino stvari, če delujejo."
+
+#. *< 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 "Omogoča ovojnico za knjižnice s podporo SSL."
+
+#. *< 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 "Omogoča podporo SSL preko 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 "Omogoča podporo SSL preko Mozilla NSS."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s se je vrnil."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s je zdaj odsoten."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s je nedejaven."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s ni več nedejaven."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s se je prijavil(a)."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Obvesti, ko"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "postaja prijatelj _odsoten"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "postaja prijatelj _nedejaven"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Prijatelj _se prijavi/odjavi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Obvestila o stanjih prijateljev"
+
+#. *< 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 "V pogovornem oknu obvešča o spremembah stanja vaših prijateljev."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Nalaganje vstavkov Tcl"
+
+#: ../libgaim/plugins/tcl/tcl.c:415
+#: ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Omogoča podporo nalaganja vstavkov Tcl"
+
+#: ../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 ""
+
 #. 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 "Dohodnim povezavam IM ni mogoče prisluhniti\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 "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3243
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3236
 #, c-format
 msgid ""
 "\n"
@@ -5660,7 +6720,7 @@
 "\n"
 "<b>Stanje</b>: %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5679,429 +6739,433 @@
 #. *< 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 "Dodatek za protokol Bonjour"
 
-#: ../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 "Uporabnik Gaim"
 
 #. 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 "Ime gostitelja"
 
 #. 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:2049
-#: ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6466
-#: ../src/protocols/sametime/sametime.c:5635
-#: ../src/protocols/silc/silc.c:1858
-#: ../src/protocols/toc/toc.c:2344
-msgid "Port"
-msgstr "Vrata"
-
-#: ../src/protocols/bonjour/bonjour.c:582
-#: ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:774
+#: ../libgaim/protocols/bonjour/bonjour.c:581
+#: ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:796
 msgid "First name"
 msgstr "Ime"
 
-#: ../src/protocols/bonjour/bonjour.c:585
-#: ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/bonjour/bonjour.c:584
+#: ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:801
 msgid "Last name"
 msgstr "Priimek"
 
-#: ../src/protocols/bonjour/bonjour.c:588
-#: ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:764
-#: ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/silc.c:939
+#: ../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-pošta"
 
-#: ../src/protocols/bonjour/bonjour.h:35
+#: ../libgaim/protocols/bonjour/bonjour.c:590
+msgid "AIM Account"
+msgstr "Račun AIM"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:593
+msgid "Jabber Account"
+msgstr "Račun Jabber"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s je zaprl pomenek."
 
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-#: ../src/protocols/bonjour/jabber.c:447
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Napaka pri nastavljanju možnosti vtičnice"
 
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
+#: ../libgaim/protocols/bonjour/jabber.c:493
+#, fuzzy
+msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-#: ../src/protocols/bonjour/jabber.c:465
-msgid "Cannot listen on socket"
-msgstr "Poslušanje vtičnice ni mogoče"
-
-#: ../src/protocols/bonjour/jabber.c:559
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Poslušanje vtičnice ni možno"
+
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-#: ../src/protocols/gg/gg.c:76
-#: ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:76
+#: ../libgaim/proxy.c:1774
 msgid "Invalid proxy settings"
 msgstr "Neveljavne proxy nastavitve"
 
-#: ../src/protocols/gg/gg.c:77
-#: ../src/proxy.c:2346
+#: ../libgaim/protocols/gg/gg.c:77
+#: ../libgaim/proxy.c:1774
 msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "Bodisi ime strežnika bodisi vrata, ki ste ju navedli za proxy, so neveljavna."
 
-#: ../src/protocols/gg/gg.c:115
-#: ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:115
+#: ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Napaka žetona"
 
-#: ../src/protocols/gg/gg.c:116
-#: ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+#: ../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 "Ni mogoče prenesti žetona.\n"
 
-#: ../src/protocols/gg/gg.c:269
-#: ../src/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269
+#: ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: ../src/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo nič zapisanega."
 
-#: ../src/protocols/gg/gg.c:276
-#: ../src/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276
+#: ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Ni mogoče odpreti datoteke"
 
-#: ../src/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Seznam prijateljev je bil uspešno shranjen!"
 
-#: ../src/protocols/gg/gg.c:307
-#: ../src/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307
+#: ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Seznama prijateljev ni mogoče naložiti"
 
-#: ../src/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Nalaganje seznama prijateljev ..."
 
-#: ../src/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Seznam prijateljev je bil uspešno naložen"
 
-#: ../src/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: ../src/protocols/gg/gg.c:380
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Izpolnite polja za registracijo."
 
-#: ../src/protocols/gg/gg.c:385
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Gesli se ne ujemata."
 
-#: ../src/protocols/gg/gg.c:394
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
 
-#: ../src/protocols/gg/gg.c:407
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov račun Gadu-Gadu je registriran"
 
-#: ../src/protocols/gg/gg.c:408
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: ../src/protocols/gg/gg.c:473
-#: ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:753
-#: ../src/protocols/jabber/jabber.c:1310
+#: ../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 "Geslo"
 
-#: ../src/protocols/gg/gg.c:478
-#: ../src/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478
+#: ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: ../src/protocols/gg/gg.c:483
-#: ../src/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483
+#: ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
-#: ../src/protocols/gg/gg.c:489
-#: ../src/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489
+#: ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Trenutni žeton"
 
-#: ../src/protocols/gg/gg.c:493
-#: ../src/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493
+#: ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:495
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
 #. General
-#: ../src/protocols/gg/gg.c:627
-#: ../src/protocols/gg/gg.c:1038
-#: ../src/protocols/gg/gg.c:1104
-#: ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:271
-#: ../src/protocols/jabber/buddy.c:803
-#: ../src/protocols/jabber/buddy.c:1522
-#: ../src/protocols/jabber/buddy.c:1704
-#: ../src/protocols/jabber/jabber.c:769
-#: ../src/protocols/msn/msn.c:1368
-#: ../src/protocols/msn/msn.c:1530
-#: ../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:1041
+#: ../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 "Vzdevek"
 
-#: ../src/protocols/gg/gg.c:632
-#: ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107
-#: ../src/protocols/jabber/jabber.c:789
-#: ../src/protocols/oscar/oscar.c:3687
-#: ../src/protocols/oscar/oscar.c:3695
+#: ../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:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Kraj"
 
-#: ../src/protocols/gg/gg.c:637
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: ../src/protocols/gg/gg.c:640
-#: ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:3651
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+#: ../libgaim/protocols/gg/gg.c:640
+#: ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Spol"
 
-#: ../src/protocols/gg/gg.c:641
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Moški ali ženska"
 
-#: ../src/protocols/gg/gg.c:642
-#: ../src/protocols/oscar/oscar.c:3651
+#: ../libgaim/protocols/gg/gg.c:642
+#: ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Moški"
 
-#: ../src/protocols/gg/gg.c:643
-#: ../src/protocols/oscar/oscar.c:3651
+#: ../libgaim/protocols/gg/gg.c:643
+#: ../libgaim/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Ženska"
 
-#: ../src/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: ../src/protocols/gg/gg.c:651
-#: ../src/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
-#: ../src/protocols/gg/gg.c:653
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Spodaj vnesite svoje iskalne pogoje"
 
-#: ../src/protocols/gg/gg.c:690
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Izpolnite polja."
 
-#: ../src/protocols/gg/gg.c:702
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Vaše veljavno geslo se razlikuje od navedenega."
 
-#: ../src/protocols/gg/gg.c:716
-msgid "Unable to change password. Error occured.\n"
+#: ../libgaim/protocols/gg/gg.c:716
+#, fuzzy
+msgid "Unable to change password. Error occurred.\n"
 msgstr "Gesla ni bilo mogoče spremeniti. Prišlo je do napake.\n"
 
-#: ../src/protocols/gg/gg.c:725
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Spremeni geslo za račun Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:726
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Geslo je bilo uspešno spremenjeno!"
 
-#: ../src/protocols/gg/gg.c:759
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: ../src/protocols/gg/gg.c:784
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
-#: ../src/protocols/gg/gg.c:788
-#: ../src/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788
+#: ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:863
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: ../src/protocols/gg/gg.c:866
-#: ../src/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866
+#: ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
-#: ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3623
+#: ../libgaim/protocols/gg/gg.c:1029
+#: ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3620
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1033
-#: ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1518
-#: ../src/protocols/jabber/buddy.c:1694
-#: ../src/protocols/oscar/oscar.c:3634
-#: ../src/protocols/silc/ops.c:1024
+#: ../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:3631
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
-#: ../src/protocols/gg/gg.c:1052
-#: ../src/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052
+#: ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "Leto rojstva"
 
-#: ../src/protocols/gg/gg.c:1092
-#: ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3798
+#: ../libgaim/protocols/gg/gg.c:1092
+#: ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3795
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
-#: ../src/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Javni imenik Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: ../src/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1196
 msgid "No matching users found"
 msgstr "Ni najdenih uporabnikov"
 
-#: ../src/protocols/gg/gg.c:1198
+#: ../libgaim/protocols/gg/gg.c:1197
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-#: ../src/protocols/gg/gg.c:1292
-#: ../src/protocols/gg/gg.c:1439
+#: ../libgaim/protocols/gg/gg.c:1291
+#: ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
-#: ../src/protocols/gg/gg.c:1375
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../src/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vaš seznam prijateljev je bil prenesen s strežnika."
 
-#: ../src/protocols/gg/gg.c:1383
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../src/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: ../src/protocols/gg/gg.c:1485
-#: ../src/protocols/gg/gg.c:1709
+#: ../libgaim/protocols/gg/gg.c:1486
+#: ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: ../src/protocols/gg/gg.c:1615
-#: ../src/protocols/msn/msn.c:564
+#: ../libgaim/protocols/gg/gg.c:1616
+#: ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: ../src/protocols/gg/gg.c:1638
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: ../src/protocols/gg/gg.c:1647
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: ../src/protocols/gg/gg.c:1651
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Zavrni"
 
-#: ../src/protocols/gg/gg.c:1668
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: ../src/protocols/gg/gg.c:1896
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: ../src/protocols/gg/gg.c:1897
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: ../src/protocols/gg/gg.c:1980
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: ../src/protocols/gg/gg.c:2003
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
 
-#: ../src/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "Spremeni geslo ..."
 
-#: ../src/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: ../src/protocols/gg/gg.c:2019
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: ../src/protocols/gg/gg.c:2023
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: ../src/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-#: ../src/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
@@ -6116,137 +7180,137 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2127
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2128
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: ../src/protocols/gg/gg.c:2176
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43
-#: ../src/protocols/silc/silc.c:1585
+#: ../libgaim/protocols/irc/cmds.c:43
+#: ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
-#: ../src/protocols/irc/cmds.c:482
-#: ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1293
+#: ../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 "trenutna tema je: %s"
 
-#: ../src/protocols/irc/cmds.c:486
-#: ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1297
+#: ../libgaim/protocols/irc/cmds.c:509
+#: ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "Ni teme"
 
-#: ../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 "Prenos datoteke ni uspel"
 
-#: ../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 ni mogel odprti vrat za poslušanje."
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Napaka pri prikazovanju MOTD"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "MOTD ni na voljo"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "Noben MOTD ni povezan s to povezavo."
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD za %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 "Strežnik ni več povezan"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Ogled 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 "_Kanal:"
 
-#: ../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 "_Geslo:"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
-#: ../src/protocols/irc/irc.c:321
-#: ../src/protocols/jabber/jabber.c:554
-#: ../src/protocols/jabber/jabber.c:893
+#: ../libgaim/protocols/irc/irc.c:337
+#: ../libgaim/protocols/jabber/jabber.c:571
+#: ../libgaim/protocols/jabber/jabber.c:916
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-#: ../src/protocols/irc/irc.c:333
-#: ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1521
+#: ../libgaim/protocols/irc/irc.c:348
+#: ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../src/protocols/irc/irc.c:404
-#: ../src/protocols/jabber/jabber.c:426
-#: ../src/protocols/oscar/oscar.c:1246
+#: ../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 "Povezava do gostitelja ni uspela"
 
-#: ../src/protocols/irc/irc.c:429
-#: ../src/protocols/jabber/jabber.c:453
+#: ../libgaim/protocols/irc/irc.c:434
+#: ../libgaim/protocols/jabber/jabber.c:473
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
-#: ../src/protocols/irc/irc.c:432
-#: ../src/protocols/jabber/jabber.c:456
+#: ../libgaim/protocols/irc/irc.c:437
+#: ../libgaim/protocols/jabber/jabber.c:476
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
-#: ../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 "Napaka pri branju"
 
-#: ../src/protocols/irc/irc.c:765
-#: ../src/protocols/silc/chat.c:1421
-#: ../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 "Uporabniki"
 
-#: ../src/protocols/irc/irc.c:768
-#: ../src/protocols/sametime/sametime.c:3354
-#: ../src/protocols/silc/chat.c:1424
-#: ../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 "Tema"
 
@@ -6258,49 +7322,60 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:902
 msgid "IRC Protocol Plugin"
 msgstr "Vstavek za protokol IRC"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vstavek za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897
-#: ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1908
-#: ../src/protocols/msn/msn.c:2044
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/oscar/oscar.c:6463
-#: ../src/protocols/sametime/sametime.c:5630
-#: ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344
-#: ../src/protocols/simple/simple.c:1769
-#: ../src/protocols/toc/toc.c:2340
+#: ../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:6532
+#: ../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 "Strežnik"
 
-#: ../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:6535
+#: ../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 "Vrata"
+
+#: ../libgaim/protocols/irc/irc.c:928
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: ../src/protocols/irc/irc.c:906
-#: ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:749
-#: ../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 "Uporabniško ime"
 
-#: ../src/protocols/irc/irc.c:909
-#: ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/irc/irc.c:934
+#: ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Resnično ime"
 
@@ -6308,1220 +7383,1217 @@
 #. 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 "Uporabi SSL"
 
-#: ../src/protocols/irc/msgs.c:107
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Neveljaven način"
 
-#: ../src/protocols/irc/msgs.c:118
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Na kanalu %s ste prepovedani."
 
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Prepovedani"
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni možno: seznam prepovedanih je poln"
 
-#: ../src/protocols/irc/msgs.c:215
-#: ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../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:215
-#: ../src/protocols/oscar/oscar.c:3624
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215
+#: ../libgaim/protocols/oscar/oscar.c:3621
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/irc/msgs.c:241
-#: ../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:241
-#: ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Trenutno na"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Nedejaven že:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Prijavljen od"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Ukrasni pridevek:</b> Supersploh<br>"
 
-#: ../src/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s je spremenil temo kanala na: %s"
 
-#: ../src/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s je odstranil temo kanala."
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema za kanal %s je: %s"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznano sporočilo '%s'"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Neznano sporočilo"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim je poslal sporočilo, ki ga IRC strežnik ni prepoznal."
 
-#: ../src/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: ../src/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Časovni odziv"
 
-#: ../src/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "Krajevni čas strežnika IRC je:"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: ../src/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: ../src/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Ni bilo mogoče poslati"
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridruževanje kanalu %s zahteva povabilo."
 
-#: ../src/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: ../src/protocols/irc/msgs.c:718
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:723
-#: ../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 "Brcnil vas je %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:746
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "način (%s %s) nastavil %s"
 
-#: ../src/protocols/irc/msgs.c:831
-#: ../src/protocols/irc/msgs.c:832
+#: ../libgaim/protocols/irc/msgs.c:839
+#: ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: ../src/protocols/irc/msgs.c:833
+#: ../libgaim/protocols/irc/msgs.c:841
 msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: ../src/protocols/irc/msgs.c:837
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogoče spremeniti"
 
-#: ../src/protocols/irc/msgs.c:897
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: ../src/protocols/irc/msgs.c:939
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor strežnika"
 
-#: ../src/protocols/irc/msgs.c:941
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: ../src/protocols/irc/msgs.c:1022
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridružiti %s:"
 
-#: ../src/protocols/irc/msgs.c:1023
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
-#: ../src/protocols/irc/msgs.c:1057
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: ../src/protocols/irc/msgs.c:1069
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: ../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."
 msgstr "odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite sporočila za vrnitev iz odsotnosti."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  pošlji ukaz chanservu"
 
-#: ../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."
 msgstr "deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: ../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 must be a channel operator to do this."
 msgstr "devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje morate biti operater kanala."
 
-#: ../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."
 msgstr "invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v navedenem ali trenutnem kanalu."
 
-#: ../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."
 msgstr "j &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
 
-#: ../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."
 msgstr "join &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
 
-#: ../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."
 msgstr "kick &lt;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to dejanje morate biti operater kanala."
 
-#: ../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>"
 msgstr "list:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri strežniki vas lahko med tem odklopijo.</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;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Pošlji ukaz memoservu"
 
-#: ../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."
 msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali razveljavi način uporabnika ali kanala."
 
-#: ../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)."
 msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
-#: ../src/protocols/irc/parse.c:129
-#: ../src/protocols/jabber/jabber.c:1746
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1766
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  pošlji ukaz nickservu"
 
-#: ../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."
 msgstr "op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: ../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."
 msgstr "operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  pošlji ukaz operservu"
 
-#: ../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."
 msgstr "part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo sporočila."
 
-#: ../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."
 msgstr "ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če uporabnik ni naveden)."
 
-#: ../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)."
 msgstr "query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
 
-#: ../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 [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Pošlji surov ukaz strežniku."
 
-#: ../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."
 msgstr "remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje morate biti operater kanala."
 
-#: ../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: Prikaže trenutni krajevni čas na strežniku IRC."
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nova tema]:  Oglejte si ali zamenjajte temo kanala."
 
-#: ../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;:  Nastavi ali odvzemi način uporabnika."
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+#: ../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."
 msgstr "voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
 
-#: ../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."
 msgstr "wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
 
-#: ../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 [strežnik] &lt;vzdevek&gt;:  Dobi več informacij o uporabniku."
 
-#: ../src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Čas odgovora od %s: %lu sekund"
 
-#: ../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 ogdovor"
 
-#: ../src/protocols/irc/parse.c:542
-#: ../src/protocols/irc/parse.c:546
-#: ../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 "Povezava prekinjena."
 
-#: ../src/protocols/jabber/auth.c:51
-msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "Za prijavo potrebuje strežnik TLS/SSL. Izberite \"Uporabi TLS, če je na voljo\" v lastnostih računa."
-
-#: ../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 "Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "Strežnik ne more preveriti vaše identitete brez gesla."
 
-#: ../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 "Overovitev z navadnim besedilom"
 
-#: ../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?"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
 
-#: ../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 "Strežnik ne uporablja nobene podprte metode overovitve"
 
 #. 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 "Neveljaven odgovor strežnika."
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "Napaka SASL"
 
-#: ../src/protocols/jabber/buddy.c:268
-#: ../src/protocols/jabber/buddy.c:772
-#: ../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 "Polno ime"
 
-#: ../src/protocols/jabber/buddy.c:269
-#: ../src/protocols/jabber/buddy.c:785
-#: ../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 "Družinsko ime"
 
-#: ../src/protocols/jabber/buddy.c:270
-#: ../src/protocols/jabber/buddy.c:789
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "Ime"
 
-#: ../src/protocols/jabber/buddy.c:272
-#: ../src/protocols/jabber/jabber.c:809
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:831
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:273
-#: ../src/protocols/jabber/buddy.c:841
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Naslov"
 
-#: ../src/protocols/jabber/buddy.c:274
-#: ../src/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: ../src/protocols/jabber/buddy.c:275
-#: ../src/protocols/jabber/buddy.c:845
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "Okraj"
 
-#: ../src/protocols/jabber/buddy.c:276
-#: ../src/protocols/jabber/buddy.c:849
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "Regija"
 
-#: ../src/protocols/jabber/buddy.c:277
-#: ../src/protocols/jabber/buddy.c:853
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/jabber/buddy.c:278
-#: ../src/protocols/jabber/buddy.c:858
-#: ../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 "Država"
 
-#: ../src/protocols/jabber/buddy.c:279
-#: ../src/protocols/jabber/buddy.c:869
-#: ../src/protocols/jabber/buddy.c:876
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/buddy.c:280
-#: ../src/protocols/jabber/buddy.c:887
-#: ../src/protocols/jabber/buddy.c:895
-#: ../src/protocols/jabber/buddy.c:1524
-#: ../src/protocols/silc/ops.c:1075
-#: ../src/protocols/silc/util.c:526
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../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-pošta"
 
-#: ../src/protocols/jabber/buddy.c:281
-#: ../src/protocols/jabber/buddy.c:910
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: ../src/protocols/jabber/buddy.c:282
-#: ../src/protocols/jabber/buddy.c:914
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: ../src/protocols/jabber/buddy.c:284
-#: ../src/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Funkcija"
 
-#: ../src/protocols/jabber/buddy.c:285
-#: ../src/protocols/jabber/buddy.c:806
-#: ../src/protocols/msn/msn.c:1589
-#: ../src/protocols/oscar/oscar.c:3667
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803
+#: ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3664
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: ../src/protocols/jabber/buddy.c:588
-#: ../src/protocols/jabber/buddy.c:589
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
-#: ../src/protocols/jabber/buddy.c:590
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: ../src/protocols/jabber/buddy.c:646
-#: ../src/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
 msgstr "Odjemalec:"
 
-#: ../src/protocols/jabber/buddy.c:650
-#: ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
 msgid "Operating System"
 msgstr "Operacijski sistem"
 
-#: ../src/protocols/jabber/buddy.c:660
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Resource"
 msgstr "Vir"
 
-#: ../src/protocols/jabber/buddy.c:793
-#: ../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 "Prednost stika"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "Odjemalec"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: ../src/protocols/jabber/buddy.c:826
-#: ../src/protocols/jabber/jabber.c:784
-#: ../src/protocols/oscar/oscar.c:3686
-#: ../src/protocols/oscar/oscar.c:3694
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:806
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: ../src/protocols/jabber/buddy.c:833
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Fotografija"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../src/protocols/jabber/buddy.c:1304
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../src/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1316
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../src/protocols/jabber/buddy.c:1323
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1332
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../src/protocols/jabber/buddy.c:1359
-#: ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686
-#: ../src/protocols/jabber/jabber.c:1168
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Napaka"
-
-#: ../src/protocols/jabber/buddy.c:1365
-#: ../src/protocols/jabber/jabber.c:1193
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1213
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../src/protocols/jabber/buddy.c:1369
-#: ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373
+#: ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../src/protocols/jabber/buddy.c:1371
-#: ../src/protocols/jabber/jabber.c:1223
-#: ../src/protocols/oscar/oscar.c:713
-#: ../src/protocols/oscar/oscar.c:5619
-#: ../src/protocols/sametime/sametime.c:3277
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/sametime/sametime.c:3270
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../src/protocols/jabber/buddy.c:1516
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1520
-#: ../src/protocols/jabber/buddy.c:1699
-#: ../src/protocols/oscar/oscar.c:3635
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3632
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../src/protocols/jabber/buddy.c:1552
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1627
+#: ../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 "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
 
-#: ../src/protocols/jabber/buddy.c:1647
+#: ../libgaim/protocols/jabber/buddy.c:1651
 msgid "Directory Query Failed"
 msgstr "Povpraševanje po imeniku ni uspelo"
 
-#: ../src/protocols/jabber/buddy.c:1648
+#: ../libgaim/protocols/jabber/buddy.c:1652
 msgid "Could not query the directory server."
 msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1682
+#: ../libgaim/protocols/jabber/buddy.c:1686
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Ukazi strežniku: %s"
 
-#: ../src/protocols/jabber/buddy.c:1689
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov Jabberja."
 
-#: ../src/protocols/jabber/buddy.c:1709
-#: ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3637
-#: ../src/protocols/oscar/oscar.c:3644
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3634
+#: ../libgaim/protocols/oscar/oscar.c:3641
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
-#: ../src/protocols/jabber/buddy.c:1718
-#: ../src/protocols/jabber/buddy.c:1719
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "Išči uporabnike Jabberja"
 
-#: ../src/protocols/jabber/buddy.c:1733
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../src/protocols/jabber/buddy.c:1750
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "Vnesi uporabniški imenik"
 
-#: ../src/protocols/jabber/buddy.c:1751
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../src/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
-#: ../src/protocols/jabber/chat.c:41
-#: ../src/protocols/oscar/oscar.c:5104
-#: ../src/protocols/yahoo/yahoochat.c:998
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5138
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Soba:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Ročica:"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ni veljavno ime sobe"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Neveljavno ime sobe"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ni veljavno ime strežnika"
 
-#: ../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 "Neveljavno ime strežnika"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ni veljavna ročica sobe"
 
-#: ../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 "Neveljavna ročica sobe"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Napaka pri nastavitvi"
 
-#: ../src/protocols/jabber/chat.c:404
-#: ../src/protocols/jabber/chat.c:547
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Ni mogoče nastaviti"
 
-#: ../src/protocols/jabber/chat.c:419
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Napaka pri nastavitvi sobe"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Te sobe se ne da nastavljati"
 
-#: ../src/protocols/jabber/chat.c:469
-#: ../src/protocols/jabber/chat.c:538
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
-#: ../src/protocols/jabber/chat.c:626
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Spreminjanje vzdevka v pogovornih sobah ne-MUC ni podprto"
 
-#: ../src/protocols/jabber/chat.c:676
-#: ../src/protocols/jabber/chat.c:687
-#: ../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 "Napaka pri pridobivanju sezama sob"
 
-#: ../src/protocols/jabber/chat.c:735
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Neveljaven strežnik"
 
-#: ../src/protocols/jabber/chat.c:773
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Vnesite konferenčni strežnik"
 
-#: ../src/protocols/jabber/chat.c:774
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Izberite konferenčni strežnik za pogovor"
 
-#: ../src/protocols/jabber/chat.c:777
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Napaka pri inicializaciji seje"
 
-#: ../src/protocols/jabber/jabber.c:232
-#: ../src/protocols/jabber/jabber.c:281
-#: ../src/protocols/jabber/jabber.c:309
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: ../src/protocols/jabber/jabber.c:361
-#: ../src/protocols/jabber/jabber.c:394
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: ../src/protocols/jabber/jabber.c:479
-#: ../src/protocols/jabber/jabber.c:903
+#: ../libgaim/protocols/jabber/jabber.c:493
+#: ../libgaim/protocols/jabber/jabber.c:924
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnice"
 
-#: ../src/protocols/jabber/jabber.c:524
-#: ../src/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:541
+#: ../libgaim/protocols/jabber/jabber.c:884
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:594
+#: ../libgaim/protocols/jabber/jabber.c:612
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: ../src/protocols/jabber/jabber.c:596
-#: ../src/protocols/jabber/jabber.c:597
+#: ../libgaim/protocols/jabber/jabber.c:614
+#: ../libgaim/protocols/jabber/jabber.c:615
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: ../src/protocols/jabber/jabber.c:603
-#: ../src/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:621
+#: ../libgaim/protocols/jabber/jabber.c:1479
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: ../src/protocols/jabber/jabber.c:605
-#: ../src/protocols/jabber/jabber.c:606
+#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libgaim/protocols/jabber/jabber.c:624
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: ../src/protocols/jabber/jabber.c:717
-#: ../src/protocols/jabber/jabber.c:718
+#: ../libgaim/protocols/jabber/jabber.c:739
+#: ../libgaim/protocols/jabber/jabber.c:740
 msgid "Already Registered"
 msgstr "Že registriran"
 
-#: ../src/protocols/jabber/jabber.c:794
-#: ../src/protocols/oscar/oscar.c:3688
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../libgaim/protocols/jabber/jabber.c:816
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "State"
 msgstr "Zvezna država"
 
-#: ../src/protocols/jabber/jabber.c:799
+#: ../libgaim/protocols/jabber/jabber.c:821
 msgid "Postal code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/jabber/jabber.c:804
-#: ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701
-#: ../src/protocols/silc/util.c:528
+#: ../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 "Telefon"
 
-#: ../src/protocols/jabber/jabber.c:814
+#: ../libgaim/protocols/jabber/jabber.c:836
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/jabber/jabber.c:844
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega računa morate izpolniti spodnja polja."
 
-#: ../src/protocols/jabber/jabber.c:825
-#: ../src/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov račun za Jabber"
 
-#: ../src/protocols/jabber/jabber.c:987
+#: ../libgaim/protocols/jabber/jabber.c:1004
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: ../src/protocols/jabber/jabber.c:992
-#: ../src/protocols/msn/session.c:350
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: ../src/protocols/jabber/jabber.c:1001
+#: ../libgaim/protocols/jabber/jabber.c:1018
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: ../src/protocols/jabber/jabber.c:1072
-#: ../src/protocols/jabber/jabber.c:1437
-#: ../src/protocols/jabber/jabber.c:1478
-#: ../src/protocols/jabber/jabber.c:1512
-#: ../src/protocols/oscar/oscar.c:782
-#: ../src/protocols/oscar/oscar.c:5410
+#: ../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:5444
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: ../src/protocols/jabber/jabber.c:1114
+#: ../libgaim/protocols/jabber/jabber.c:1134
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/protocols/jabber/jabber.c:1116
+#: ../libgaim/protocols/jabber/jabber.c:1136
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: ../src/protocols/jabber/jabber.c:1121
+#: ../libgaim/protocols/jabber/jabber.c:1141
 msgid "To"
 msgstr "Za"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: ../src/protocols/jabber/jabber.c:1127
+#: ../libgaim/protocols/jabber/jabber.c:1147
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: ../src/protocols/jabber/jabber.c:1184
-#: ../src/protocols/jabber/jabber.c:1194
-#: ../src/protocols/jabber/jabber.c:1204
-#: ../src/protocols/jabber/jabber.c:1214
-#: ../src/protocols/jabber/jabber.c:1224
-msgid "Priority"
-msgstr "Prednost stika"
-
-#: ../src/protocols/jabber/jabber.c:1253
+#: ../libgaim/protocols/jabber/jabber.c:1273
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: ../src/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1274
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: ../src/protocols/jabber/jabber.c:1258
-#: ../src/protocols/jabber/jabber.c:1259
+#: ../libgaim/protocols/jabber/jabber.c:1278
+#: ../libgaim/protocols/jabber/jabber.c:1279
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: ../src/protocols/jabber/jabber.c:1315
+#: ../libgaim/protocols/jabber/jabber.c:1335
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../src/protocols/jabber/jabber.c:1320
-#: ../src/protocols/jabber/jabber.c:1321
+#: ../libgaim/protocols/jabber/jabber.c:1340
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1321
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: ../src/protocols/jabber/jabber.c:1331
-#: ../src/protocols/oscar/oscar.c:6180
-#: ../src/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/oscar/oscar.c:6246
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1336
-#: ../src/protocols/oscar/oscar.c:6191
-#: ../src/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1356
+#: ../libgaim/protocols/oscar/oscar.c:6257
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../libgaim/protocols/jabber/jabber.c:1437
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../libgaim/protocols/jabber/jabber.c:1439
 msgid "Conflict"
 msgstr "Spor"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../libgaim/protocols/jabber/jabber.c:1441
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: ../src/protocols/jabber/jabber.c:1423
+#: ../libgaim/protocols/jabber/jabber.c:1443
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../libgaim/protocols/jabber/jabber.c:1445
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1427
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../libgaim/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../libgaim/protocols/jabber/jabber.c:1449
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../libgaim/protocols/jabber/jabber.c:1451
 msgid "Malformed Jabber ID"
 msgstr "Nepravilen Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1433
+#: ../libgaim/protocols/jabber/jabber.c:1453
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../libgaim/protocols/jabber/jabber.c:1455
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: ../src/protocols/jabber/jabber.c:1439
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../src/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: ../src/protocols/jabber/jabber.c:1457
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../libgaim/protocols/jabber/jabber.c:1492
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: ../src/protocols/jabber/jabber.c:1475
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../libgaim/protocols/jabber/jabber.c:1500
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../libgaim/protocols/jabber/jabber.c:1503
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: ../src/protocols/jabber/jabber.c:1487
+#: ../libgaim/protocols/jabber/jabber.c:1507
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: ../src/protocols/jabber/jabber.c:1494
-#: ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../libgaim/protocols/jabber/jabber.c:1520
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../libgaim/protocols/jabber/jabber.c:1524
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../libgaim/protocols/jabber/jabber.c:1526
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: ../src/protocols/jabber/jabber.c:1508
+#: ../libgaim/protocols/jabber/jabber.c:1528
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../libgaim/protocols/jabber/jabber.c:1530
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1536
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprt tip vrstice"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: ../src/protocols/jabber/jabber.c:1534
+#: ../libgaim/protocols/jabber/jabber.c:1554
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: ../src/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: ../src/protocols/jabber/jabber.c:1603
+#: ../libgaim/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: ../src/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1643
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1628
+#: ../libgaim/protocols/jabber/jabber.c:1648
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogoče včlaniti kot \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1647
+#: ../libgaim/protocols/jabber/jabber.c:1667
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Neznana vloga: \"%s\""
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/jabber/jabber.c:1654
+#: ../libgaim/protocols/jabber/jabber.c:1674
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
 
-#: ../src/protocols/jabber/jabber.c:1707
+#: ../libgaim/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../libgaim/protocols/jabber/jabber.c:1758
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1742
+#: ../libgaim/protocols/jabber/jabber.c:1762
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1751
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../src/protocols/jabber/jabber.c:1756
+#: ../libgaim/protocols/jabber/jabber.c:1776
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1762
+#: ../libgaim/protocols/jabber/jabber.c:1782
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: ../src/protocols/jabber/jabber.c:1768
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1774
+#: ../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."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1780
+#: ../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."
 msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1786
+#: ../libgaim/protocols/jabber/jabber.c:1806
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: ../src/protocols/jabber/jabber.c:1792
+#: ../libgaim/protocols/jabber/jabber.c:1812
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: ../src/protocols/jabber/jabber.c:1798
+#: ../libgaim/protocols/jabber/jabber.c:1818
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: ../src/protocols/jabber/jabber.c:1803
+#: ../libgaim/protocols/jabber/jabber.c:1823
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
 
@@ -7535,437 +8607,429 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1886
-#: ../src/protocols/jabber/jabber.c:1888
+#: ../libgaim/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1941
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1914
-msgid "Use TLS if available"
-msgstr "Uporabite TLS, če je na voljo"
-
-#: ../src/protocols/jabber/jabber.c:1919
-msgid "Require TLS"
-msgstr "Zahtevaj TLS"
-
-#: ../src/protocols/jabber/jabber.c:1922
+#: ../libgaim/protocols/jabber/jabber.c:1967
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1927
+#: ../libgaim/protocols/jabber/jabber.c:1972
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: ../src/protocols/jabber/jabber.c:1932
-#: ../src/protocols/simple/simple.c:1775
+#: ../libgaim/protocols/jabber/jabber.c:1977
+#: ../libgaim/protocols/simple/simple.c:1841
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1936
-#: ../src/protocols/silc/silc.c:1854
+#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
-#: ../src/protocols/jabber/message.c:117
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Sporočilo od %s"
 
-#: ../src/protocols/jabber/message.c:181
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s je spremenil temo na: %s"
 
-#: ../src/protocols/jabber/message.c:183
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema je: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Dostava sporočila za uporabnika %s ni uspela: %s"
 
-#: ../src/protocols/jabber/message.c:236
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Napaka sporočila Jabber"
 
-#: ../src/protocols/jabber/message.c:319
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koda %s)"
 
-#: ../src/protocols/jabber/parser.c:279
-#: ../src/protocols/jabber/parser.c:288
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: ../src/protocols/jabber/presence.c:308
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: ../src/protocols/jabber/presence.c:313
-#: ../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 "Uporabnik %s želi dodati %s na svoj seznam prijateljev."
 
-#: ../src/protocols/jabber/presence.c:322
-#: ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5035
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2358
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
-#: ../src/protocols/jabber/presence.c:323
-#: ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5036
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2360
+#: ../libgaim/protocols/oscar/oscar.c:5070
 msgid "_Deny"
 msgstr "_Zavrni"
 
-#: ../src/protocols/jabber/presence.c:380
-#: ../src/protocols/jabber/presence.c:381
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
 
-#: ../src/protocols/jabber/presence.c:385
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: ../src/protocols/jabber/presence.c:387
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: ../src/protocols/jabber/presence.c:425
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: ../src/protocols/jabber/presence.c:428
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
 
-#: ../src/protocols/jabber/si.c:729
-#: ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:766
+#: ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Pošiljanje datoteke ni uspelo"
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Težava ujemanja (sinhronizacije) seznama prijateljev pri %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. Do you want this buddy to be added?"
 msgstr "%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja v skupino?"
 
-#: ../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 to be added?"
 msgstr "%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja?"
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v Gaimu)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Neveljaven naslov e-pošte"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Manjka veljavno ime domene"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Že prijavljen"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Neveljavno uporabniško ime"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Neveljavno poimenovanje"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Seznam poln"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Že tam"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#: ../src/protocols/msn/error.c:70
-#: ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
-#: ../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 "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Sporočilo o prenosu ni uspelo"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
-#: ../src/protocols/msn/error.c:112
-#: ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112
+#: ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Storitev je trenutno nedosegljiva"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
-#: ../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 "Strežnik je nedostopen"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Strežnik za obveščanje prijateljev je nedelujoč"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Nepričakovano"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Prijateljsko ime se spreminja preveč pogosto"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
-#: ../src/protocols/msn/error.c:198
-#: ../src/protocols/oscar/oscar.c:1331
-#: ../src/protocols/silc/ops.c:1717
-#: ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1311
+#: ../libgaim/protocols/silc/ops.c:1716
+#: ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Neznana koda napake %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN napaka: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "Ravnokar ste poslali mežik!"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
-#: ../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 "To je ime, pod katerim vas bodo videli vaši MSN prijatelji."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Nastavite številko vašega domačega telefona."
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Nastavite številko vašega službenega telefona."
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Nastavite številko vašega mobilnega telefona."
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Dovoli MSN strani za mobilnike?"
 
-#: ../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?"
 msgstr "Ali želite dovoliti oz. prepovedati prijateljem na vašem seznamu, da vam pošiljajo MSN strani za mobilnike na vaš mobilni telefon?"
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Dovoli"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Prepovej"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Pošlji sporočilo na mobilnik."
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: ../src/protocols/msn/msn.c:548
-#: ../src/protocols/msn/msn.c:555
-#: ../src/protocols/msn/msn.c:564
-#: ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2878
-#: ../src/protocols/yahoo/yahoo.c:2884
+#: ../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"
@@ -7974,344 +9038,347 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:555
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: ../src/protocols/msn/msn.c:585
-#: ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2707
-#: ../src/protocols/yahoo/yahoo.c:3292
+#: ../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 "Pridem precej nazaj"
 
-#: ../src/protocols/msn/msn.c:589
-#: ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2849
-#: ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/silc/buddy.c:1473
-#: ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2709
-#: ../src/protocols/yahoo/yahoo.c:3295
+#: ../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 "Zaposlen"
 
-#: ../src/protocols/msn/msn.c:593
-#: ../src/protocols/yahoo/yahoo.c:2717
-#: ../src/protocols/yahoo/yahoo.c:3307
+#: ../libgaim/protocols/msn/msn.c:591
+#: ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: ../src/protocols/msn/msn.c:597
-#: ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3313
+#: ../libgaim/protocols/msn/msn.c:595
+#: ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#: ../src/protocols/msn/msn.c:621
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: ../src/protocols/msn/msn.c:626
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: ../src/protocols/msn/msn.c:630
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: ../src/protocols/msn/msn.c:634
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi št. mobilnega telefona ..."
 
-#: ../src/protocols/msn/msn.c:640
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: ../src/protocols/msn/msn.c:645
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: ../src/protocols/msn/msn.c:655
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: ../src/protocols/msn/msn.c:679
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: ../src/protocols/msn/msn.c:689
-#: ../src/protocols/novell/novell.c:3439
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: ../src/protocols/msn/msn.c:727
+#: ../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."
 msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL. Več informacij na http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:755
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: ../src/protocols/msn/msn.c:1361
-#: ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736
-#: ../src/protocols/zephyr/zephyr.c:1153
+#: ../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>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1368
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1061
+#: ../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:1458
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: ../src/protocols/msn/msn.c:1463
-#: ../src/protocols/msn/msn.c:1789
-#: ../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 "Napaka pri pridobivanju profila"
 
-#: ../src/protocols/msn/msn.c:1531
-#: ../src/protocols/oscar/oscar.c:3673
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537
+#: ../libgaim/protocols/oscar/oscar.c:3670
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Starost"
 
-#: ../src/protocols/msn/msn.c:1533
-#: ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539
+#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: ../src/protocols/msn/msn.c:1534
-#: ../src/protocols/novell/novell.c:1478
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../src/protocols/msn/msn.c:1539
-#: ../src/protocols/msn/msn.c:1718
-#: ../src/protocols/msn/msn.c:1724
-#: ../src/protocols/msn/msn.c:1731
+#: ../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 "Hobiji in interesi"
 
-#: ../src/protocols/msn/msn.c:1545
-#: ../src/protocols/msn/msn.c:1652
-#: ../src/protocols/msn/msn.c:1658
-#: ../src/protocols/msn/msn.c:1665
-#: ../src/protocols/msn/msn.c:1673
-#: ../src/protocols/msn/msn.c:1680
+#: ../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 "Nekaj o meni"
 
-#: ../src/protocols/msn/msn.c:1551
+#: ../libgaim/protocols/msn/msn.c:1557
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Splošno</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1560
-#: ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: ../src/protocols/msn/msn.c:1561
+#: ../libgaim/protocols/msn/msn.c:1567
 msgid "Interests"
 msgstr "Zanimanja"
 
-#: ../src/protocols/msn/msn.c:1562
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "Domači ljubljenčki"
 
-#: ../src/protocols/msn/msn.c:1563
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "Domači kraj"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr "Dosedanji kraji bivanja"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "Humor"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "Glasba"
 
-#: ../src/protocols/msn/msn.c:1568
-#: ../src/protocols/msn/msn.c:1740
-#: ../src/protocols/msn/msn.c:1746
-#: ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../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 "Najljubši citat"
 
-#: ../src/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Družabno</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1581
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
 msgstr "Boljša polovica"
 
-#: ../src/protocols/msn/msn.c:1582
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "Domači telefon"
 
-#: ../src/protocols/msn/msn.c:1583
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "Domači telefon 2"
 
-#: ../src/protocols/msn/msn.c:1584
-#: ../src/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/oscar/oscar.c:3682
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "Osebni mobilni tel."
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "Osebni e-naslov"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1594
 msgid "Personal IM"
 msgstr "Osebni IM"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
 msgstr "Obletnica"
 
-#: ../src/protocols/msn/msn.c:1591
-#: ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "Opombe"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/msn/msn.c:1601
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Osebno</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1602
-#: ../src/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv službe"
 
-#: ../src/protocols/msn/msn.c:1603
-#: ../src/protocols/oscar/oscar.c:3702
+#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Company"
 msgstr "Podjetje"
 
-#: ../src/protocols/msn/msn.c:1604
-#: ../src/protocols/novell/novell.c:1480
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Oddelek"
 
-#: ../src/protocols/msn/msn.c:1605
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "Poklic"
 
-#: ../src/protocols/msn/msn.c:1606
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "Službeni telefon"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "Službeni telefon 2"
 
-#: ../src/protocols/msn/msn.c:1608
-#: ../src/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/oscar/oscar.c:3690
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "Službeni mobilni tel."
 
-#: ../src/protocols/msn/msn.c:1610
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "Službeni pager"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "Službeni faks"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "Službeni e-naslov"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr "Službeni IM"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1626
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Poslovno</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1630
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Podatki o stiku</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1689
-#: ../src/protocols/msn/msn.c:1695
-#: ../src/protocols/msn/msn.c:1702
-#: ../src/protocols/msn/msn.c:1709
+#: ../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 "Priljubljene stvari"
 
-#: ../src/protocols/msn/msn.c:1754
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: ../src/protocols/msn/msn.c:1766
-#: ../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 "Domača stran"
 
-#: ../src/protocols/msn/msn.c:1791
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: ../src/protocols/msn/msn.c:1792
+#: ../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 public profile."
 msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa še ni ustvaril javnega profila."
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../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."
 msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1801
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1801
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -8325,84 +9392,97 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2023
-#: ../src/protocols/msn/msn.c:2025
+#: ../libgaim/protocols/msn/msn.c:2033
+#: ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "Vstavek za protokol MSN"
 
-#: ../src/protocols/msn/msn.c:2053
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: ../src/protocols/msn/msn.c:2058
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: ../src/protocols/msn/msn.c:2066
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
-#: ../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 "Ni se mogoče povezati"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532
-#: ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %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 "Uporabnika ni mogoče dodati na %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 "Ni mogoče blokirati uporabnika %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 "Uporabniku ni mogoče dovoliti na %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 ni mogoče dodati, saj je vaš seznam prijateljev poln."
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven račun potnega lista."
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
-#: ../src/protocols/msn/notification.c:820
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: ../src/protocols/msn/notification.c:875
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: ../src/protocols/msn/notification.c:1308
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
@@ -8429,15 +9509,15 @@
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Napaka pri branju"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8446,438 +9526,365 @@
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:299
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Strežnik ne podpira tega protokola."
 
-#: ../src/protocols/msn/session.c:303
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju HTTP."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:307
-#: ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3416
-#: ../src/protocols/yahoo/yahoo.c:191
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3410
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: ../src/protocols/msn/session.c:310
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/msn/session.c:319
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni možno overoviti: %s"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in poskusite znova."
 
-#: ../src/protocols/msn/session.c:345
-#: ../src/protocols/msn/session.c:347
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: ../src/protocols/msn/session.c:346
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: ../src/protocols/msn/session.c:348
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Pričetek overovitve"
 
-#: ../src/protocols/msn/session.c:349
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Pridobivanje piškotka"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Pošljanje piškotka"
 
-#: ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Stran od računalnika"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Na telefonu"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: ../src/protocols/msn/switchboard.c:401
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
 
-#: ../src/protocols/msn/switchboard.c:409
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporočila ni mogoče poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: ../src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporočila ni mogoče poslati, saj uporabnik ni na zvezi:"
 
-#: ../src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
-#: ../src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
 
-#: ../src/protocols/msn/switchboard.c:425
+#: ../libgaim/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporočila ni bilo poslano, ker je prišlo do napake v stikalni plošči:"
 
-#: ../src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#: ../src/protocols/msn/switchboard.c:953
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal mežik!"
 
-#: ../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 "Uporabnik %s (%s) želi dodati %s na svoj seznam prijateljev."
 
-#: ../src/protocols/msn/userlist.c:111
-#: ../src/protocols/yahoo/yahoo.c:913
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: ../src/protocols/msn/userlist.c:112
-#: ../src/protocols/yahoo/yahoo.c:915
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Zavrni"
 
-#: ../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 vas je dodal(a) na svoj seznam prijateljev."
 
-#: ../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 vas je odstranil(a) s svojega seznama prijateljev."
 
-#: ../src/protocols/msn/userlist.c:667
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: ../src/protocols/msn/userlist.c:669
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Ni bilo mogoče prebrati glave sporočila, ki ga je poslal strežnik"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "Ni mogoče prebrati sporočila s strežnika: %s.  Ukaz je %hd, dolžina pa %hd."
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Neznana napaka strežnika."
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "uporabniki: %s, datoteke: %s, velikost: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "Ni bilo dodati \"%s\" na vaš seznam Napster vroče"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s je zahteval tvoje informacije"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s je zahteval 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:2237
-#: ../src/protocols/yahoo/yahoo.c:2264
-#: ../src/protocols/yahoo/yahoo.c:2347
-#: ../src/protocols/yahoo/yahoo.c:2362
-#: ../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 "Ni se bilo mogoče povezati."
-
-#: ../src/protocols/napster/napster.c:599
-#: ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Skupina:"
-
-#. *< 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 "Dodatek za protokol NAPSTER"
-
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "Zahtevani parametri niso podani"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "Pisanje v omrežje ni možno"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "Branje iz omrežja ni možno"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "Napaka pri komunikaciji s strežnikom"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "Konference ni mogoče najti"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "Konferenca ne obstaja"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "Mapa s tem imenom že obstaja"
 
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "Ni podprto"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "Geslo je poteklo"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
 msgstr "Napačno geslo"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "Uporabnika ni mogoče najti"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "Račun je bil onemogočen"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "Strežnik ni mogel dostopiti do mape"
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "Vaš sistemski skrbnik je to možnost onemogočil"
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "Strežnik ni na voljo; poskusite pozneje"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Stika ni mogoče dodati v isto mapo dvakrat"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "Vas ni mogoče dodati"
 
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "Glavni arhiv je narobe nastavljen"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
 msgstr "Neveljavno uporabniško ime ali geslo"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ni mogoče prepoznati gostitelja uporabniškega imena, ki ste ga vnesli"
 
-#: ../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"
 msgstr "Vaš račun je bil onemogočen, ker ste vnesli preveč napačnih gesel"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Iste osebe ne morete dvakrat dodati pomenku"
 
-#: ../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 "Dosegli ste mejo števila dovoljenih stikovstikov"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
 msgstr "Vnesli ste napačno uporabniško ime"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "Med posodabljanjem mape je prišlo do napake"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "Nezdružljiva različica protokola"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "Uporabnik vas je zavrnil"
 
-#: ../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"
 msgstr "Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom hkrati"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "Uporabnike ni na zvezi ali pa ste zavrnjeni"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Prijava spodletela (%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 "Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%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 "Ni bilo moč dodati %s na vaš seznam prijateljev (%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 "Sporočila (%s) ni mogoče poslati."
 
-#: ../src/protocols/novell/novell.c:493
-#: ../src/protocols/novell/novell.c:985
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%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 "Sporočila ni mogoče poslati %s. Ni mogoče ustvariti konference (%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 "Sporočila ni bilo moč poslati. Ni mogoče ustvariti konference (%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 creating folder (%s)."
 msgstr "Uporabnika %s ni mogoče premakniti v mapo %s na seznamu nedejavnih na strežniku. Napaka pri usvarjanju mape (%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 list (%s)."
 msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape na strežniku (%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 "Podrobnosti za uporabnika %s (%s) ni moč dobiti."
 
-#: ../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 "Uporabnika ni moč dodati na seznam zasebnosti (%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 "%s ni moč dodati na seznam zavrnjenih (%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 "%s ni moč dodati na seznam dovoljenih (%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 "%s ni moč odstraniti s seznama zasebnosti (%s)."
 
-#: ../src/protocols/novell/novell.c:942
-#: ../src/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
 
-#: ../src/protocols/novell/novell.c:1012
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: ../src/protocols/novell/novell.c:1121
-#: ../src/protocols/novell/novell.c:1691
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
-#: ../src/protocols/novell/novell.c:1476
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonska številka"
 
-#: ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: ../src/protocols/novell/novell.c:1486
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: ../src/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Uporabniška št."
 
@@ -8888,41 +9895,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1518
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Polno ime"
 
-#: ../src/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1667
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
-#: ../src/protocols/novell/novell.c:1724
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: ../src/protocols/novell/novell.c:1736
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../src/protocols/novell/novell.c:1739
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
-#: ../src/protocols/novell/novell.c:1874
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: ../src/protocols/novell/novell.c:1902
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: ../src/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8933,15 +9940,16 @@
 "\n"
 "Poslano: %s"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-#: ../src/protocols/novell/novell.c:2012
+#. 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 "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: ../src/protocols/novell/novell.c:2068
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
@@ -8950,15 +9958,15 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2166
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se želite povezati."
 
-#: ../src/protocols/novell/novell.c:2188
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
-#: ../src/protocols/novell/novell.c:2497
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -8972,414 +9980,467 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3541
-#: ../src/protocols/novell/novell.c:3543
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vstavek za protokol Novell GroupWise Messenger"
 
-#: ../src/protocols/novell/novell.c:3562
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: ../src/protocols/oscar/flap_connection.c:222
+#: ../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 "Strežnik je zaprl povezavo."
 
-#: ../src/protocols/oscar/flap_connection.c:224
-msgid "Lost connection with server for an unknown reason."
-msgstr "Povezava s strežnikom izgubljena iz neznanega razloga."
-
-#: ../src/protocols/oscar/flap_connection.c:226
+#: ../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
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr "S strežnikom niste povezani."
+
+#: ../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 "Na povezavi s strežnikom prejeti neveljavni podatki."
 
-#: ../src/protocols/oscar/flap_connection.c:228
-msgid "Could not establish a connection with the server."
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, fuzzy, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
 msgstr "Povezave s strežnikom ni mogoče vzpostaviti."
 
-#: ../src/protocols/oscar/odc.c:41
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Oddaljeni uporabnik je zaprl povezavo."
 
-#: ../src/protocols/oscar/odc.c:45
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
 
-#: ../src/protocols/oscar/odc.c:49
-msgid "Lost connection with the remote user for an unknown reason."
+#: ../libgaim/protocols/oscar/odc.c:44
+#, fuzzy, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr "Iz neznanega razloga izgubljena povezava z oddaljenim uporabnikom."
 
-#: ../src/protocols/oscar/odc.c:53
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-#: ../src/protocols/oscar/odc.c:57
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
-#: ../src/protocols/oscar/odc.c:567
+#: ../libgaim/protocols/oscar/odc.c:561
 msgid "Direct IM established"
 msgstr "Vzpostavljeno neposredno sporočanje"
 
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Datoteka %s je %s, kar je več od največje velikosti za %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "Neveljaven SNAC"
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Prenos do odjemalca"
 
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Odjemalec ne podpira"
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Odjemalec je zavrnil"
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Odgovor prevelik"
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Odgovori so se izgubili"
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "Preveč zloben (pošiljatelj)"
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "Preveč zloben (prejemnik)"
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Prekoračitev seznama"
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Čakalna vrsta je polna"
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Na omrežju AOL ni dovoljeno"
 
-#: ../src/protocols/oscar/oscar.c:346
+#: ../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 "(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev svojega računa AIM/ICQ.)"
 
-#: ../src/protocols/oscar/oscar.c:449
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
 msgstr "(Prišlo je do napake pri prejemu tega sporočila. Prijatelj, s katerim se pogovarjate, ima verjetno hroščastega odjemalca.)"
 
-#: ../src/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Glasovno"
 
-#: ../src/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: ../src/protocols/oscar/oscar.c:634
-#: ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:524
+#: ../libgaim/protocols/oscar/oscar.c:609
+#: ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Pomenek"
 
-#: ../src/protocols/oscar/oscar.c:637
-#: ../src/protocols/oscar/oscar.c:5789
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5853
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: ../src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Igre"
 
-#: ../src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: ../src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "Pošlji seznam prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: ../src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: ../src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ strežniški posrednik"
 
-#: ../src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: ../src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: ../src/protocols/oscar/oscar.c:674
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: ../src/protocols/oscar/oscar.c:677
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:680
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "Varnost vključena"
 
-#: ../src/protocols/oscar/oscar.c:683
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "Video v živo"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/oscar/oscar.c:5596
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5630
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: ../src/protocols/oscar/oscar.c:715
-#: ../src/protocols/oscar/oscar.c:5624
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5662
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: ../src/protocols/oscar/oscar.c:717
-#: ../src/protocols/oscar/oscar.c:5614
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5648
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: ../src/protocols/oscar/oscar.c:725
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "Prisoten"
 
-#: ../src/protocols/oscar/oscar.c:802
-#: ../src/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2805
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: ../src/protocols/oscar/oscar.c:811
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: ../src/protocols/oscar/oscar.c:966
-msgid "Could not connect to authentication server"
-msgstr "Povezava z overovitvenim strežnikom ni uspela"
-
-#: ../src/protocols/oscar/oscar.c:968
-msgid "Could not connect to BOS server"
-msgstr "Povezava na strežnik BOS ni uspela"
-
-#: ../src/protocols/oscar/oscar.c:998
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Povezava z overovitvenim strežnikom ni uspela:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"Povezava na strežnik BOS ni uspela:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: ../src/protocols/oscar/oscar.c:1003
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "Povezava vzpostavljena, piškotek poslan"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1034
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#: ../src/protocols/oscar/oscar.c:1219
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je vzdevek neveljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: ../src/protocols/oscar/oscar.c:1308
-#: ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Neveljaven vzdevek ali geslo."
-
-#: ../src/protocols/oscar/oscar.c:1313
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "Neveljavno pojavno ime."
+
+#: ../libgaim/protocols/oscar/oscar.c:1288
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "Neveljavno geslo."
+
+#: ../libgaim/protocols/oscar/oscar.c:1293
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1317
+#: ../libgaim/protocols/oscar/oscar.c:1297
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../libgaim/protocols/oscar/oscar.c:1302
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#: ../src/protocols/oscar/oscar.c:1327
+#: ../libgaim/protocols/oscar/oscar.c:1307
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
 
-#: ../src/protocols/oscar/oscar.c:1363
+#: ../libgaim/protocols/oscar/oscar.c:1342
 msgid "Could Not Connect"
 msgstr "Povezava ni uspela"
 
-#: ../src/protocols/oscar/oscar.c:1368
+#: ../libgaim/protocols/oscar/oscar.c:1347
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: ../src/protocols/oscar/oscar.c:1391
+#: ../libgaim/protocols/oscar/oscar.c:1370
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: ../src/protocols/oscar/oscar.c:1405
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1406
+#: ../libgaim/protocols/oscar/oscar.c:1385
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#: ../src/protocols/oscar/oscar.c:1446
-#: ../src/protocols/oscar/oscar.c:1480
+#: ../libgaim/protocols/oscar/oscar.c:1425
+#: ../libgaim/protocols/oscar/oscar.c:1468
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
 
-#: ../src/protocols/oscar/oscar.c:1449
-#: ../src/protocols/oscar/oscar.c:1483
+#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libgaim/protocols/oscar/oscar.c:1471
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka za AIM."
 
-#: ../src/protocols/oscar/oscar.c:1569
+#: ../libgaim/protocols/oscar/oscar.c:1557
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
 
-#: ../src/protocols/oscar/oscar.c:1572
+#: ../libgaim/protocols/oscar/oscar.c:1560
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka."
 
-#: ../src/protocols/oscar/oscar.c:1598
+#: ../libgaim/protocols/oscar/oscar.c:1586
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: ../src/protocols/oscar/oscar.c:2156
+#: ../libgaim/protocols/oscar/oscar.c:1642
+#, fuzzy
+msgid "Unable to initialize connection"
+msgstr ""
+"Ni mogoče ustvariti vtičnice:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2140
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: ../src/protocols/oscar/oscar.c:2166
+#: ../libgaim/protocols/oscar/oscar.c:2150
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: ../src/protocols/oscar/oscar.c:2200
+#: ../libgaim/protocols/oscar/oscar.c:2182
 #, c-format
 msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali želite poslati zahtevo po pooblastilu?"
 
-#: ../src/protocols/oscar/oscar.c:2205
+#: ../libgaim/protocols/oscar/oscar.c:2187
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:2207
+#: ../libgaim/protocols/oscar/oscar.c:2189
 msgid "_Request Authorization"
 msgstr "_Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:2251
-#: ../src/protocols/oscar/oscar.c:2259
-#: ../src/protocols/oscar/oscar.c:2367
-#: ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5021
-#: ../src/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:2230
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:2344
+#: ../libgaim/protocols/oscar/oscar.c:2368
+#: ../libgaim/protocols/oscar/oscar.c:5055
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: ../src/protocols/oscar/oscar.c:2258
+#: ../libgaim/protocols/oscar/oscar.c:2236
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: ../src/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2346
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9388,12 +10449,12 @@
 "Uporabnik %u želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379
-#: ../src/protocols/oscar/oscar.c:5033
+#: ../libgaim/protocols/oscar/oscar.c:2356
+#: ../libgaim/protocols/oscar/oscar.c:5067
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: ../src/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2368
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -9402,17 +10463,17 @@
 "Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2392
+#: ../libgaim/protocols/oscar/oscar.c:2369
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2376
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:2407
+#: ../libgaim/protocols/oscar/oscar.c:2384
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9425,7 +10486,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2415
+#: ../libgaim/protocols/oscar/oscar.c:2392
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9438,7 +10499,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2423
+#: ../libgaim/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9451,20 +10512,20 @@
 "Sporočilo se glasi:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2444
+#: ../libgaim/protocols/oscar/oscar.c:2421
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2450
+#: ../libgaim/protocols/oscar/oscar.c:2427
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali želite dodati prijatelja s to vizitko na vaš seznam prijateljev?"
 
-#: ../src/protocols/oscar/oscar.c:2454
+#: ../libgaim/protocols/oscar/oscar.c:2431
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: ../src/protocols/oscar/oscar.c:2538
+#: ../libgaim/protocols/oscar/oscar.c:2515
 #, 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."
@@ -9473,7 +10534,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2547
+#: ../libgaim/protocols/oscar/oscar.c:2524
 #, 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."
@@ -9482,7 +10543,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2556
+#: ../libgaim/protocols/oscar/oscar.c:2533
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -9491,7 +10552,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2565
+#: ../libgaim/protocols/oscar/oscar.c:2542
 #, 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."
@@ -9500,7 +10561,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2574
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, 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."
@@ -9509,7 +10570,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2583
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, 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."
@@ -9518,129 +10579,130 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:2639
+#: ../libgaim/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2700
+#: ../libgaim/protocols/oscar/oscar.c:2677
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC je izvrgel napako: %s\n"
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2736
+#: ../libgaim/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: ../src/protocols/oscar/oscar.c:2736
-#: ../src/protocols/oscar/oscar.c:2741
-#: ../src/protocols/oscar/oscar.c:2799
-#: ../src/protocols/oscar/oscar.c:2803
+#: ../libgaim/protocols/oscar/oscar.c:2713
+#: ../libgaim/protocols/oscar/oscar.c:2718
+#: ../libgaim/protocols/oscar/oscar.c:2780
+#: ../libgaim/protocols/oscar/oscar.c:2784
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: ../src/protocols/oscar/oscar.c:2739
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2716
+#: ../libgaim/protocols/sametime/sametime.c:2360
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../src/protocols/oscar/oscar.c:2799
+#: ../libgaim/protocols/oscar/oscar.c:2780
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../src/protocols/oscar/oscar.c:2802
+#: ../libgaim/protocols/oscar/oscar.c:2783
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: ../src/protocols/oscar/oscar.c:2828
+#: ../libgaim/protocols/oscar/oscar.c:2809
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../src/protocols/oscar/oscar.c:2833
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2814
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "Član od"
 
-#: ../src/protocols/oscar/oscar.c:2838
+#: ../libgaim/protocols/oscar/oscar.c:2819
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: ../src/protocols/oscar/oscar.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:2837
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../src/protocols/oscar/oscar.c:2945
+#: ../libgaim/protocols/oscar/oscar.c:2937
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3126
+#: ../libgaim/protocols/oscar/oscar.c:3118
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: ../src/protocols/oscar/oscar.c:3345
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporočil."
 
-#: ../src/protocols/oscar/oscar.c:3346
+#: ../libgaim/protocols/oscar/oscar.c:3340
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite znova."
 
-#: ../src/protocols/oscar/oscar.c:3418
+#: ../libgaim/protocols/oscar/oscar.c:3412
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: ../src/protocols/oscar/oscar.c:3431
-#: ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3425
+#: ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: ../src/protocols/oscar/oscar.c:3649
-#: ../src/protocols/silc/util.c:556
+#: ../libgaim/protocols/oscar/oscar.c:3646
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../src/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/oscar/oscar.c:3673
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../src/protocols/oscar/oscar.c:3680
+#: ../libgaim/protocols/oscar/oscar.c:3677
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../src/protocols/oscar/oscar.c:3689
-#: ../src/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3686
+#: ../libgaim/protocols/oscar/oscar.c:3694
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../src/protocols/oscar/oscar.c:3703
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../src/protocols/oscar/oscar.c:3704
+#: ../libgaim/protocols/oscar/oscar.c:3701
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../src/protocols/oscar/oscar.c:3706
+#: ../libgaim/protocols/oscar/oscar.c:3703
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../src/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3761
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../src/protocols/oscar/oscar.c:3804
+#: ../libgaim/protocols/oscar/oscar.c:3801
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -9649,64 +10711,64 @@
 msgstr[2] "Naslednja vzdevka sta povezana z %s"
 msgstr[3] "Naslednji vzdevki so povezani z %s"
 
-#: ../src/protocols/oscar/oscar.c:3809
+#: ../libgaim/protocols/oscar/oscar.c:3806
 msgid "Screen name"
 msgstr "Zaslonsko ime"
 
-#: ../src/protocols/oscar/oscar.c:3835
+#: ../libgaim/protocols/oscar/oscar.c:3832
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
-#: ../src/protocols/oscar/oscar.c:3856
+#: ../libgaim/protocols/oscar/oscar.c:3853
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
 
-#: ../src/protocols/oscar/oscar.c:3858
+#: ../libgaim/protocols/oscar/oscar.c:3855
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../src/protocols/oscar/oscar.c:3889
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: ../src/protocols/oscar/oscar.c:3892
+#: ../libgaim/protocols/oscar/oscar.c:3889
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker se zahtevano poimenovanje razlikuje od izvirnega."
 
-#: ../src/protocols/oscar/oscar.c:3895
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je neveljavno."
 
-#: ../src/protocols/oscar/oscar.c:3898
+#: ../libgaim/protocols/oscar/oscar.c:3895
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je zahtevano poimenovanje predolgo."
 
-#: ../src/protocols/oscar/oscar.c:3901
+#: ../libgaim/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to ime že en zahtevek."
 
-#: ../src/protocols/oscar/oscar.c:3904
+#: ../libgaim/protocols/oscar/oscar.c:3901
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že preveč računov."
 
-#: ../src/protocols/oscar/oscar.c:3907
+#: ../libgaim/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov neveljaven."
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../libgaim/protocols/oscar/oscar.c:3907
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../src/protocols/oscar/oscar.c:3920
+#: ../libgaim/protocols/oscar/oscar.c:3917
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9715,29 +10777,29 @@
 "Vaše ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3921
-#: ../src/protocols/oscar/oscar.c:3928
+#: ../libgaim/protocols/oscar/oscar.c:3918
+#: ../libgaim/protocols/oscar/oscar.c:3925
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../src/protocols/oscar/oscar.c:3926
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../src/protocols/oscar/oscar.c:4101
+#: ../libgaim/protocols/oscar/oscar.c:4098
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Vaša slika IM ni bila poslana. Za pošiljanje slik IM morate biti \"neposredno povezani\"."
 
-#: ../src/protocols/oscar/oscar.c:4341
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../src/protocols/oscar/oscar.c:4342
+#: ../libgaim/protocols/oscar/oscar.c:4351
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokončana. Za zdaj je vaš profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: ../src/protocols/oscar/oscar.c:4356
+#: ../libgaim/protocols/oscar/oscar.c:4365
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9746,11 +10808,11 @@
 msgstr[2] "Največja dolžina profila %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina profila %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: ../src/protocols/oscar/oscar.c:4361
+#: ../libgaim/protocols/oscar/oscar.c:4370
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../src/protocols/oscar/oscar.c:4404
+#: ../libgaim/protocols/oscar/oscar.c:4414
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9759,63 +10821,63 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: ../src/protocols/oscar/oscar.c:4409
+#: ../libgaim/protocols/oscar/oscar.c:4419
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../src/protocols/oscar/oscar.c:4478
+#: ../libgaim/protocols/oscar/oscar.c:4488
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogoče dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: ../src/protocols/oscar/oscar.c:4480
-#: ../src/protocols/oscar/oscar.c:4879
-#: ../src/protocols/oscar/oscar.c:4893
+#: ../libgaim/protocols/oscar/oscar.c:4490
+#: ../libgaim/protocols/oscar/oscar.c:4903
+#: ../libgaim/protocols/oscar/oscar.c:4917
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../src/protocols/oscar/oscar.c:4584
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../src/protocols/oscar/oscar.c:4585
+#: ../libgaim/protocols/oscar/oscar.c:4595
 msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Gaim začasno ni uspel pridobiti vašega seznama prijateljev z AIM strežnikov. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../src/protocols/oscar/oscar.c:4777
-#: ../src/protocols/oscar/oscar.c:4778
-#: ../src/protocols/oscar/oscar.c:4783
-#: ../src/protocols/oscar/oscar.c:4937
-#: ../src/protocols/oscar/oscar.c:4938
-#: ../src/protocols/oscar/oscar.c:4943
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4799
+#: ../libgaim/protocols/oscar/oscar.c:4804
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4972
+#: ../libgaim/protocols/oscar/oscar.c:4977
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../src/protocols/oscar/oscar.c:4877
+#: ../libgaim/protocols/oscar/oscar.c:4901
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4901
+#: ../libgaim/protocols/oscar/oscar.c:4915
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../src/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4915
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
 
-#: ../src/protocols/oscar/oscar.c:4974
+#: ../libgaim/protocols/oscar/oscar.c:5008
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../src/protocols/oscar/oscar.c:4980
+#: ../libgaim/protocols/oscar/oscar.c:5014
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: ../src/protocols/oscar/oscar.c:5024
+#: ../libgaim/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9825,17 +10887,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5069
+#: ../libgaim/protocols/oscar/oscar.c:5103
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:5070
+#: ../libgaim/protocols/oscar/oscar.c:5104
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5107
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9844,169 +10906,174 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5074
+#: ../libgaim/protocols/oscar/oscar.c:5108
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../src/protocols/oscar/oscar.c:5110
-#: ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5144
+#: ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../src/protocols/oscar/oscar.c:5150
+#: ../libgaim/protocols/oscar/oscar.c:5184
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../src/protocols/oscar/oscar.c:5220
+#: ../libgaim/protocols/oscar/oscar.c:5254
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../src/protocols/oscar/oscar.c:5382
+#: ../libgaim/protocols/oscar/oscar.c:5416
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5687
+#: ../libgaim/protocols/oscar/oscar.c:5729
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../src/protocols/oscar/oscar.c:5688
+#: ../libgaim/protocols/oscar/oscar.c:5730
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../src/protocols/oscar/oscar.c:5734
+#: ../libgaim/protocols/oscar/oscar.c:5776
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../src/protocols/oscar/oscar.c:5738
+#: ../libgaim/protocols/oscar/oscar.c:5780
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../src/protocols/oscar/oscar.c:5742
-#: ../src/protocols/oscar/peer.c:941
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "_Poveži"
 
-#: ../src/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/oscar/oscar.c:5818
+#, fuzzy
+msgid "Get AIM Info"
+msgstr "Dobi združena polja"
+
+#: ../libgaim/protocols/oscar/oscar.c:5824
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../src/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/oscar/oscar.c:5832
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../src/protocols/oscar/oscar.c:5781
+#: ../libgaim/protocols/oscar/oscar.c:5845
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../src/protocols/oscar/oscar.c:5803
+#: ../libgaim/protocols/oscar/oscar.c:5867
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:5860
+#: ../libgaim/protocols/oscar/oscar.c:5926
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:5863
+#: ../libgaim/protocols/oscar/oscar.c:5929
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:5868
+#: ../libgaim/protocols/oscar/oscar.c:5934
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../src/protocols/oscar/oscar.c:5885
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:5886
+#: ../libgaim/protocols/oscar/oscar.c:5952
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
 
-#: ../src/protocols/oscar/oscar.c:5893
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: ../src/protocols/oscar/oscar.c:5949
+#: ../libgaim/protocols/oscar/oscar.c:6015
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../src/protocols/oscar/oscar.c:5994
+#: ../libgaim/protocols/oscar/oscar.c:6060
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../src/protocols/oscar/oscar.c:5997
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:5998
+#: ../libgaim/protocols/oscar/oscar.c:6064
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../src/protocols/oscar/oscar.c:6015
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../src/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../src/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6083
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../src/protocols/oscar/oscar.c:6186
+#: ../libgaim/protocols/oscar/oscar.c:6252
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../src/protocols/oscar/oscar.c:6197
+#: ../libgaim/protocols/oscar/oscar.c:6263
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../src/protocols/oscar/oscar.c:6201
+#: ../libgaim/protocols/oscar/oscar.c:6267
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../libgaim/protocols/oscar/oscar.c:6277
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6218
+#: ../libgaim/protocols/oscar/oscar.c:6284
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: ../src/protocols/oscar/oscar.c:6222
+#: ../libgaim/protocols/oscar/oscar.c:6288
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../libgaim/protocols/oscar/oscar.c:6292
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../src/protocols/oscar/oscar.c:6230
+#: ../libgaim/protocols/oscar/oscar.c:6296
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../libgaim/protocols/oscar/oscar.c:6303
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:6243
+#: ../libgaim/protocols/oscar/oscar.c:6309
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../src/protocols/oscar/oscar.c:6248
+#: ../libgaim/protocols/oscar/oscar.c:6314
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../src/protocols/oscar/oscar.c:6314
+#: ../libgaim/protocols/oscar/oscar.c:6382
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:6317
+#: ../libgaim/protocols/oscar/oscar.c:6385
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
@@ -10020,174 +11087,887 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6442
-#: ../src/protocols/oscar/oscar.c:6444
+#: ../libgaim/protocols/oscar/oscar.c:6511
+#: ../libgaim/protocols/oscar/oscar.c:6513
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:6469
-#: ../src/protocols/zephyr/zephyr.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:6538
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: ../src/protocols/oscar/oscar.c:6473
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6542
+#, fuzzy
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
 "Vedno uporabi strežnik prehoda AIM/ICQ\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
-#: ../src/protocols/oscar/peer.c:613
+#: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje."
 
-#: ../src/protocols/oscar/peer.c:662
-#: ../src/protocols/oscar/peer.c:693
+#: ../libgaim/protocols/oscar/peer.c:703
+#: ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Poskus povezave na %s:%hu."
 
-#: ../src/protocols/oscar/peer.c:753
+#: ../libgaim/protocols/oscar/peer.c:803
 msgid "Attempting to connect via proxy server."
 msgstr "Poskus povezave prek strežnika-prehoda."
 
-#: ../src/protocols/oscar/peer.c:931
+#: ../libgaim/protocols/oscar/peer.c:980
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s vas je ravnokar prosil za neposredno povezavo na %s"
 
-#: ../src/protocols/oscar/peer.c:935
+#: ../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 "To zahteva neposredno povezavo med dvema računalnikoma in je nujno potrebno za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med tveganja zasebnosti."
 
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "Osnovni podatki"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "Osebna predstavitev"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "Številka QQ"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "Država/Regija"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "Pokrajina/Zv. država"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "Simbol"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "Znak horoskopa"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "Krvna skupina"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "Srednja šola"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "E-naslov"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "Poštna številka"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "Mobilna št."
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "Telefonska št."
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "Vodnar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "Ribi"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "Oven"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "Bik"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "Dvojčka"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "Rak"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "Lev"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "Devica"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "Tehtnica"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "Škorpijon"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "Strelec"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "Kozorog"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "Podgana"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "Govedo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "Tiger"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "Zajec"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "Zmaj"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "Kača"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "Konj"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "Koza"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr "Opica"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "Petelin"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "Pes"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "Prašič"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "Drugo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "Spremeni moje podatke"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "Posodobi moje podatke"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "Vaši podatki so bili posodobljeni"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Zahtevo uporabnika %d ste zavrnili."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "Vnesite svoj razlog:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "Zavrni zahtevo"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "Oprosti, nisi moj tip ..."
+
+#: ../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 "Zavrni"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "Uspešno ste odstranili prijatelja"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "Uspešno ste se odstranili od prijatelja"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "Uporabnik %d potrebuje avtentikacijo"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "Vnesite zahtevo tukaj"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "Bi bil moj prijatelj?"
+
+#: ../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 "Pošlji"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "%d ste dodali na svoj seznam prijateljev"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "Napaka QQid"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "Neveljaven QQid"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID:"
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "ID skupine"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "Avtor"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "Opis skupine"
+
+#: ../libgaim/protocols/qq/group.c:107
+#, fuzzy
+msgid "Auth"
+msgstr "Pooblasti"
+
+#: ../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 ""
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "Uporabnik %d se je prijavil za članstvo v skupini %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 "Razlog: %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 "Operacija QQ Qun"
+
+#: ../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 "Odobri"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "Skupina je bila dodana na vaš seznam prijateljev."
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "Nisem član"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "Sem član(ica)"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "Prijavljam se za članstvo"
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "Jaz sem skrbnik"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "Neznano stanje"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "Ta skupina ne dovoljuje novih članov"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "Uspešno ste zapustili skupino."
+
+#: ../libgaim/protocols/qq/group_join.c:251
+#, fuzzy
+msgid "QQ Group Auth"
+msgstr "Vnesite ime skupine"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "Ste prepričani, da želite zapustiti za Qun?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "Pojdi"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Koda [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+#, fuzzy
+msgid "Group Operation Error"
+msgstr "Prišlo je do napake."
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "Želite odobriti zahtevo?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "Uspešno ste ustvarili Qun"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+#, fuzzy
+msgid "Would you like to set up the Qun details now?"
+msgstr "Jo želite nastaviti za ikono prijatelja?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+#, fuzzy
+msgid "Setup"
+msgstr "_Nastavi"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "Sistemsko sporočilo"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "Strežnik ACK"
+
+#: ../libgaim/protocols/qq/im.c:565
+#, fuzzy
+msgid "Send IM fail\n"
+msgstr "Želite poslati geslo na naslov '%s'?"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Napačno geslo!"
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137
+#: ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Ni se bilo mogoče povezati."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Na voljo"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Odsoten"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Neviden"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Nepovezan"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Neveljavno ime"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Izbor"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Izberi številko"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Obrazi"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "Spremenite svoj obraz QQ"
+
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "Spremeni obraz"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "Posodobi"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Trenutno povezan</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Zadnja osvežitev</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Način povezovanja</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP strežnika</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Moj javni IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:522
+msgid "<i>Information below may not be accurate</i><br>\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Čas prijave</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>IP zadnje prijave:</b> %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Čas zadnje prijave</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "Prijavni podatki"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Spremeni moje podatke"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Spremeni moj obraz"
+
+#: ../libgaim/protocols/qq/qq.c:808
+#: ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Spremeni geslo"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Pokaži prijavne podatke"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "Izhod iz QQ Qun"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "Ta funkcija še ni bila implementirana"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "Prosimo, počakajte na novo različico"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004
+#: ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "Protokol QQ\tVstavek"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "Prijava v TCP"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "Prijava skrita"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "Napaka pošiljanja vtičnice"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Povezava zavrnjena"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Napaka vtičnice"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "Ni mogoče brati iz vtičnice"
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "Uporabnik %d je zavrnil datoteko %s"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "Datoteka poslana"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "Uporabnik %d je prekinil prenos %s"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Povezava izgubljena!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "Prijava spodletela, ni odziva!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "Čas povezovanja pretečen!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "Uporabniški podatki niso posodobljeni!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Pošllji paket"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Paketi izgubljeni, želite znova poslati?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "Ali želite dodati tega prijatelja?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "Uporabnik %s vas je dodal"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "Ga želite dodati?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "Uporabnik %s vas je dodal [%s]"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "Uuporabnik %s je zavrnil vašo zahtevo."
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "Uporabnik %s je ugodil vaši zahtevi."
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s vas želijo [%s] dodati kot prijatelja"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Sporočilo: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s ni na vašem seznamu prijateljev."
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "Ga želite dodati?"
+
+#: ../libgaim/protocols/sametime/sametime.c:414
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
 
-#: ../src/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1260
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID skupine zapiskov:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1263
 #, c-format
 msgid "Info for Group %s"
 msgstr "Podatki za skupino %s"
 
-#: ../src/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1265
 msgid "Notes Address Book Information"
 msgstr "Informacije o adresarju zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1297
 msgid "Invite Group to Conference..."
 msgstr "Povabi skupino na konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1307
 msgid "Get Notes Address Book Info"
 msgstr "Pridobi podatke o adresarju zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1460
 msgid "Sending Handshake"
 msgstr "Pošljanje rokovanja"
 
-#: ../src/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1465
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Čakanje na potrditev rokovanja"
 
-#: ../src/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1470
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Rokovanje potrjeno, pošiljanje prijave"
 
-#: ../src/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1475
 msgid "Waiting for Login Acknowledgement"
 msgstr "Čakanje na potrditev prijave"
 
-#: ../src/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1480
 msgid "Login Redirected"
 msgstr "Prijava preusmerjena"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1486
 msgid "Forcing Login"
 msgstr "Prisilno prijavljanje"
 
-#: ../src/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1490
 msgid "Login Acknowledged"
 msgstr "Prijava potrjena"
 
-#: ../src/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1495
 msgid "Starting Services"
 msgstr "Zagon storitev"
 
-#: ../src/protocols/sametime/sametime.c:1501
+#: ../libgaim/protocols/sametime/sametime.c:1500
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../src/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1598
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
 
-#: ../src/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1603
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1656
+#: ../libgaim/protocols/sametime/sametime.c:1655
 msgid "Connection reset"
 msgstr "Povezava ponovno nastavljena"
 
-#: ../src/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1662
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Napaka pri branju iz vtičnice: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1692
-#: ../src/protocols/sametime/sametime.c:3688
+#: ../libgaim/protocols/sametime/sametime.c:1685
+#: ../libgaim/protocols/sametime/sametime.c:3681
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../src/protocols/sametime/sametime.c:1730
+#: ../libgaim/protocols/sametime/sametime.c:1723
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
 
-#: ../src/protocols/sametime/sametime.c:1904
+#: ../libgaim/protocols/sametime/sametime.c:1897
 msgid "Conference Closed"
 msgstr "Konferenčni pogovor zaprt"
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/sametime/sametime.c:2361
+#: ../libgaim/protocols/sametime/sametime.c:2354
 msgid "Unable to send message: "
 msgstr "Ni moč poslati sporočila: "
 
-#: ../src/protocols/sametime/sametime.c:2918
+#: ../libgaim/protocols/sametime/sametime.c:2911
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: ../src/protocols/sametime/sametime.c:3209
+#: ../libgaim/protocols/sametime/sametime.c:3202
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../src/protocols/sametime/sametime.c:3210
+#: ../libgaim/protocols/sametime/sametime.c:3203
 msgid "Speakers"
 msgstr "Zvočniki"
 
-#: ../src/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3204
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3215
+#: ../libgaim/protocols/sametime/sametime.c:3208
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: ../src/protocols/sametime/sametime.c:3249
+#: ../libgaim/protocols/sametime/sametime.c:3242
 #, c-format
 msgid ""
 "\n"
@@ -10196,7 +11976,7 @@
 "\n"
 "<b>Podpira:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3254
+#: ../libgaim/protocols/sametime/sametime.c:3247
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10204,143 +11984,139 @@
 "\n"
 "<b>Zunanji uporabnik</b>"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3353
 msgid "Create conference with user"
 msgstr "Ustvari konferenčni pogovor z uporabnikom"
 
-#: ../src/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3354
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Vnesite temo za nov konferenčni pogovor in sporočilo vabila za %s"
 
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3358
 msgid "New Conference"
 msgstr "Nov konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3360
 msgid "Create"
 msgstr "Ustvari"
 
-#: ../src/protocols/sametime/sametime.c:3431
+#: ../libgaim/protocols/sametime/sametime.c:3424
 msgid "Available Conferences"
 msgstr "Konferenčni pogovori na voljo"
 
-#: ../src/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3430
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../libgaim/protocols/sametime/sametime.c:3437
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3438
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco in k njej povabili uporabnika."
 
-#: ../src/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3443
 msgid "Invite to Conference"
 msgstr "Povabi na konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite"
-msgstr "Povabi"
-
-#: ../src/protocols/sametime/sametime.c:3540
+#: ../libgaim/protocols/sametime/sametime.c:3533
 msgid "Invite to Conference..."
 msgstr "Povabi na konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:3545
+#: ../libgaim/protocols/sametime/sametime.c:3538
 msgid "Send TEST Announcement"
 msgstr "Pošlji obvestilo TEST"
 
-#: ../src/protocols/sametime/sametime.c:3592
+#: ../libgaim/protocols/sametime/sametime.c:3585
 msgid "No Sametime Community Server specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../src/protocols/sametime/sametime.c:3614
+#: ../libgaim/protocols/sametime/sametime.c:3607
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr "Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
-#: ../src/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:3612
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: ../src/protocols/sametime/sametime.c:3620
+#: ../libgaim/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../src/protocols/sametime/sametime.c:4077
+#: ../libgaim/protocols/sametime/sametime.c:4075
 msgid "<b>External User</b><br>"
 msgstr "<b>Zunanji uporabnik</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4080
+#: ../libgaim/protocols/sametime/sametime.c:4078
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Uporabniški ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4086
+#: ../libgaim/protocols/sametime/sametime.c:4084
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Polno ime:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4092
+#: ../libgaim/protocols/sametime/sametime.c:4090
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Zadnjič razpoznan odjemalec:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../libgaim/protocols/sametime/sametime.c:4098
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../libgaim/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Podpira:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4113
+#: ../libgaim/protocols/sametime/sametime.c:4111
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:4256
-#: ../src/protocols/sametime/sametime.c:5419
+#: ../libgaim/protocols/sametime/sametime.c:4254
+#: ../libgaim/protocols/sametime/sametime.c:5418
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: ../src/protocols/sametime/sametime.c:4259
-#: ../src/protocols/sametime/sametime.c:5422
+#: ../libgaim/protocols/sametime/sametime.c:4257
+#: ../libgaim/protocols/sametime/sametime.c:5421
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4283
+#: ../libgaim/protocols/sametime/sametime.c:4281
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabniški ID"
 
-#: ../src/protocols/sametime/sametime.c:4284
+#: ../libgaim/protocols/sametime/sametime.c:4282
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:4289
+#: ../libgaim/protocols/sametime/sametime.c:4287
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: ../src/protocols/sametime/sametime.c:4359
+#: ../libgaim/protocols/sametime/sametime.c:4357
 msgid "Unable to add user: user not found"
 msgstr "Ni moč dodati uporabnika: ni ga mogoče najti"
 
-#: ../src/protocols/sametime/sametime.c:4361
+#: ../libgaim/protocols/sametime/sametime.c:4359
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. Ta vnos je bil odstranjen iz vašega seznama prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4364
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-#: ../src/protocols/sametime/sametime.c:4938
+#: ../libgaim/protocols/sametime/sametime.c:4936
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10349,208 +12125,208 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5069
+#: ../libgaim/protocols/sametime/sametime.c:5068
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../libgaim/protocols/sametime/sametime.c:5073
 msgid "Buddy List Storage Mode"
 msgstr "Način hrambe seznama prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../libgaim/protocols/sametime/sametime.c:5076
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../libgaim/protocols/sametime/sametime.c:5078
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s strežnikovim"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../libgaim/protocols/sametime/sametime.c:5080
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s strežnikovim in ga shrani"
 
-#: ../src/protocols/sametime/sametime.c:5083
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s strežnikom"
 
-#: ../src/protocols/sametime/sametime.c:5132
+#: ../libgaim/protocols/sametime/sametime.c:5131
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za račun %s"
 
-#: ../src/protocols/sametime/sametime.c:5171
+#: ../libgaim/protocols/sametime/sametime.c:5170
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za račun %s"
 
-#: ../src/protocols/sametime/sametime.c:5224
+#: ../libgaim/protocols/sametime/sametime.c:5223
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogoče dodati: že obstaja"
 
-#: ../src/protocols/sametime/sametime.c:5225
+#: ../libgaim/protocols/sametime/sametime.c:5224
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' že obstaja v vašem seznamu prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:5228
-#: ../src/protocols/sametime/sametime.c:5357
+#: ../libgaim/protocols/sametime/sametime.c:5227
+#: ../libgaim/protocols/sametime/sametime.c:5356
 msgid "Unable to add group"
 msgstr "Skupine ni mogoče dodati"
 
-#: ../src/protocols/sametime/sametime.c:5287
+#: ../libgaim/protocols/sametime/sametime.c:5286
 msgid "Possible Matches"
 msgstr "Možni zadetki"
 
-#: ../src/protocols/sametime/sametime.c:5303
+#: ../libgaim/protocols/sametime/sametime.c:5302
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5304
+#: ../libgaim/protocols/sametime/sametime.c:5303
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:5309
+#: ../libgaim/protocols/sametime/sametime.c:5308
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5351
+#: ../libgaim/protocols/sametime/sametime.c:5350
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: ../src/protocols/sametime/sametime.c:5353
+#: ../libgaim/protocols/sametime/sametime.c:5352
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5393
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5395
+#: ../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."
 msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v seznam prijateljev vnesli skupino in njene člane."
 
-#: ../src/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5442
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5444
+#: ../libgaim/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
-#: ../src/protocols/sametime/sametime.c:5476
+#: ../libgaim/protocols/sametime/sametime.c:5475
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: ../src/protocols/sametime/sametime.c:5477
+#: ../libgaim/protocols/sametime/sametime.c:5476
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5481
+#: ../libgaim/protocols/sametime/sametime.c:5480
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: ../src/protocols/sametime/sametime.c:5518
+#: ../libgaim/protocols/sametime/sametime.c:5517
 msgid "Search for a user"
 msgstr "Išči uporabnike"
 
-#: ../src/protocols/sametime/sametime.c:5519
+#: ../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."
 msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5522
+#: ../libgaim/protocols/sametime/sametime.c:5521
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
-#: ../src/protocols/sametime/sametime.c:5534
+#: ../libgaim/protocols/sametime/sametime.c:5533
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: ../src/protocols/sametime/sametime.c:5538
+#: ../libgaim/protocols/sametime/sametime.c:5537
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../libgaim/protocols/sametime/sametime.c:5545
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: ../src/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/sametime/sametime.c:5642
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri strežniške preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5653
+#: ../libgaim/protocols/sametime/sametime.c:5652
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
-#: ../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 "Uporabnik %s ni prisoten v omrežju"
 
-#: ../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 "Pogodba"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ni mogoče izvesti pogodbe"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Prišlo je do napake med pogodbo"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Pogodba spodletela"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Časovna omejitev med pogodbo potekla"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Pogodba je bila preklicana"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Pogodba se je že začela"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Pogodba se ne more začeti z vami"
 
-#: ../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 "Oddaljen uporabnik ni več prisoten v omrežju"
 
-#: ../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 agreement?"
 msgstr "Zahteva po pogodbi sprejeta od %s. Želite izvesti pogodbo?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10561,675 +12337,671 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Zahteva pogodbe"
 
-#: ../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 z geslom"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Ni mogoče nastaviti ključa IM"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Nastavi geslo IM"
 
-#: ../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 "Dobi javni ključ"
 
-#: ../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 "Javnega ključa ni mogoče dobiti"
 
-#: ../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 "Prikaži javni ključ"
 
-#: ../src/protocols/silc/buddy.c:635
-#: ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:237
+#: ../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 "Ni mogoče naložiti javnega ključa"
 
-#: ../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 "Informacije o uporabniku"
 
-#: ../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 "Ni mogoče dobiti informacij o uporabniku"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Prijatelj %s ni zaupljiv"
 
-#: ../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."
 msgstr "Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega ključa.  Uporabite lahko ukaz Dobi javni ključ."
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: ../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 "Prijatelj %s ni prisoten v omrežju"
 
-#: ../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."
 msgstr "Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite Uvozi za uvoz javnega ključa."
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "_Uvozi ..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Izberite ustreznega uporabnika"
 
-#: ../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."
 msgstr "Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: ../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."
 msgstr "Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Odpeto"
 
-#: ../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 "Neurejeno"
 
-#: ../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 "Zbudi me"
 
-#: ../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 "Hiperaktiven"
 
-#: ../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:487
+#: ../libgaim/protocols/silc/buddy.c:1486
+#: ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Vesel"
 
-#: ../src/protocols/silc/buddy.c:1488
-#: ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1488
+#: ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Žalosten"
 
-#: ../src/protocols/silc/buddy.c:1490
-#: ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1490
+#: ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Jezen"
 
-#: ../src/protocols/silc/buddy.c:1492
-#: ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1492
+#: ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#: ../src/protocols/silc/buddy.c:1494
-#: ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:495
+#: ../libgaim/protocols/silc/buddy.c:1494
+#: ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Osramočen"
 
-#: ../src/protocols/silc/buddy.c:1496
-#: ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:497
+#: ../libgaim/protocols/silc/buddy.c:1496
+#: ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
-#: ../src/protocols/silc/buddy.c:1498
-#: ../src/protocols/silc/util.c:499
+#: ../libgaim/protocols/silc/buddy.c:1498
+#: ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/protocols/silc/buddy.c:1500
-#: ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:501
+#: ../libgaim/protocols/silc/buddy.c:1500
+#: ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Zaspan"
 
-#: ../src/protocols/silc/buddy.c:1502
-#: ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:503
+#: ../libgaim/protocols/silc/buddy.c:1502
+#: ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Zdolgočasen"
 
-#: ../src/protocols/silc/buddy.c:1504
-#: ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:505
+#: ../libgaim/protocols/silc/buddy.c:1504
+#: ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Razburjen"
 
-#: ../src/protocols/silc/buddy.c:1506
-#: ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:507
+#: ../libgaim/protocols/silc/buddy.c:1506
+#: ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#: ../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 "Načini uporabnika"
 
-#: ../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 "Razpoloženje"
 
-#: ../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 "Priljubljen stik"
 
-#: ../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 "Priljubljen jezik"
 
-#: ../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 "Naprava"
 
-#: ../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 "Časovni pas"
 
-#: ../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 "Lokacija"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Ponastavi ključ IM"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "Pogovor z izmenjavo ključev"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "Pogovor z geslom"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Dobi javni ključ ..."
 
-#: ../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 "Ubij uporabnika"
 
-#: ../src/protocols/silc/buddy.c:1670
-#: ../src/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670
+#: ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Riši po tabli"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Geslo:"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "kanal %s ne obstaja v omrežju"
 
-#: ../src/protocols/silc/chat.c:81
-#: ../src/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81
+#: ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ni mogoče dobiti informacij o kanalu"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Ime kanala:</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>Število uporabnikov:</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>Ustanovitelj kanala:</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>Cifra kanala:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../src/protocols/silc/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC kanala:</b> %s"
 
-#: ../src/protocols/silc/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:152
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Prstni odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni ključ kanala"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Odpri javni ključ ..."
 
-#: ../src/protocols/silc/chat.c:400
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Geslo kanala"
 
-#: ../src/protocols/silc/chat.c:407
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih ključev kanala"
 
-#: ../src/protocols/silc/chat.c:412
+#: ../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 signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
 msgstr "Overovitev kanala služi obrambi kanala pred neavtoriziranim dostopom. Overovitev lahko temelji na geslih in digitalnih podpisih. Če je geslo nastavljeno, je potrebno za pridružitev. Če so nastavljeni javni ključi kanala, se mu lahko pridružijo le uporabniki, katerih ključi so na seznamu."
 
-#: ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:906
+#: ../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 "Overovitev kanala"
 
-#: ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423
+#: ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
-#: ../src/protocols/silc/chat.c:578
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: ../src/protocols/silc/chat.c:582
-#: ../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 "Geslo"
 
-#: ../src/protocols/silc/chat.c:593
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Vnesite ime zasebne skupine kanala %s in njeno geslo."
 
-#: ../src/protocols/silc/chat.c:595
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Dodaj zasebno skupino kanala"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Meja uporabnikov"
 
-#: ../src/protocols/silc/chat.c:723
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Nastavite mejo uporabnikov kanala. Izberite 0 za ponastavitev meje."
 
-#: ../src/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Informacije"
-
-#: ../src/protocols/silc/chat.c:886
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Seznam povabljenih"
 
-#: ../src/protocols/silc/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Seznam prepovedanih"
 
-#: ../src/protocols/silc/chat.c:899
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Dodaj zasebno skupino"
 
-#: ../src/protocols/silc/chat.c:912
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Začasno ponastavi"
 
-#: ../src/protocols/silc/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Začasno nastavi"
 
-#: ../src/protocols/silc/chat.c:925
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Nastavi mejo uporabnikov"
 
-#: ../src/protocols/silc/chat.c:931
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Ponastavi omejitev teme"
 
-#: ../src/protocols/silc/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Nastavi omejitev teme"
 
-#: ../src/protocols/silc/chat.c:943
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Ponastavi zasebni kanal"
 
-#: ../src/protocols/silc/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Nastavi zasebni kanal"
 
-#: ../src/protocols/silc/chat.c:955
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Ponastavi skrivni kanal"
 
-#: ../src/protocols/silc/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Nastavi skrivni kanal"
 
-#: ../src/protocols/silc/chat.c:1034
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste ustanovitelj kanala <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1038
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Ustanovitelj kanala na <I>%s</I> je <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1097
+#: ../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 "Preden se pridružite zasebni skupini, se morate pridružiti kanalu %s"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Pridruži se zasebni skupini"
 
-#: ../src/protocols/silc/chat.c:1100
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Ni se mogoče pridružiti zasebni skupini"
 
-#: ../src/protocols/silc/chat.c:1294
-#: ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "Ukaz klica"
 
-#: ../src/protocols/silc/chat.c:1294
-#: ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "Ni mogoče klicati ukaza"
 
-#: ../src/protocols/silc/chat.c:1295
-#: ../src/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295
+#: ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../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 "Varen prenos datotek"
 
-#: ../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 "Napaka pri prenosu datotek"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Ni dovoljeno"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Pogodba ni uspela"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Seja za prenos datotek ne obstaja"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nobena seja prenosa datotek ni aktivna"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Prenos datotek se je že začel"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ni bilo mogoče izvesti pogodbe za prenos datotek"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ni bilo mogoče začeti prenosa datotek"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Ni mogoče poslati datoteke"
 
-#: ../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 je spremenil temo kanala <I>%s</I> na: %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> je nastavil načine kanala <I>%s</I> na: %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> je odstranil vse načine kanala <I>%s</I>"
 
-#: ../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> je nastavil načine uporabnika <I>%s</I> na: %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> je odstranil vse načine uporabnika <I>%s</I>"
 
-#: ../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 "Iz <I>%s</I> vas je brcnil uporabnik <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 "Ubil vas je %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 "Ubil vas je %s (%s)"
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Odjava strežnika"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Osebni podatki"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Rojstni dan"
 
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Funkcija v službi"
 
-#: ../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 "Organizacija"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Enota"
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Opomba"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
-#: ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#: ../libgaim/protocols/silc/ops.c:1183
+#: ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "Resnično ime"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Besedilo stanja"
 
-#: ../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 "Prstni odtis javnega ključa"
 
-#: ../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 "Odtis javnega ključa"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Več ..."
 
-#: ../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 "Odpni se od strežnika"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Odpenjanje ni možno"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Ne da se nastaviti teme"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Vzdevka ni moč spremeniti"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Seznam sob"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Ni mogoče dobiti seznama sob"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Javni ključ ni bil sprejet"
 
-#: ../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 "Informacije o strežniku"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr "Ni moč dobiti informacij o strežniku"
 
-#: ../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 "Statistika strežnika"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr "Ni moč dobiti statistike strežnika"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11264,112 +13036,112 @@
 "Vseh operaterjev strežnikov: %d\n"
 "Vseh operaterjev usmerjevalnikov: %d\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
-#: ../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 ni uspel"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr "Odgovor ping sprejet od strežnika"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr "Ni bilo mogoče ubiti uporabnika"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr "Izmenjava ključa ni uspela"
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1721
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo nove povezave."
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-#: ../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 "Nadaljevalna seja"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr "Overovljanje povezave"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr "Preverjanje javnega ključa strežnika"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr "Zahtevano geslo"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira vašega ključa ali mu ne zaupa"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpršene možnosti"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napačen podpis"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napačen piškot"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-#: ../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 still like to accept this public key?"
 msgstr "Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu ključu. Želite kljub temu sprejeti ta javni ključ?"
 
-#: ../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 "Sprejet javni ključ uporabnika %s. Želite sprejeti ta javni ključ?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11382,66 +13154,66 @@
 "%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 "Preveri javni ključ"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Pokaži ..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega ključa"
 
-#: ../src/protocols/silc/silc.c:158
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: ../src/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ni moč začeti povezave odjemalca SILC"
 
-#: ../src/protocols/silc/silc.c:202
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-#: ../src/protocols/silc/silc.c:287
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: ../src/protocols/silc/silc.c:328
+#: ../libgaim/protocols/silc/silc.c:323
 msgid "Cannot initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
-#: ../src/protocols/silc/silc.c:335
+#: ../libgaim/protocols/silc/silc.c:330
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Imenika ~/.silc ni mogoče najti/do njega dostopati."
 
 #. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
-#: ../src/protocols/silc/silc.c:349
+#: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Ni mogoče naložiti para ključev SILC: %s"
 
-#: ../src/protocols/silc/silc.c:369
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "Ni bilo mogoče ustvariti povezave"
 
-#: ../src/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
-#: ../src/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
 msgstr "Zaljubljen"
 
-#: ../src/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11449,259 +13221,259 @@
 "\n"
 "Vaša priljubljena metoda stikov"
 
-#: ../src/protocols/silc/silc.c:703
-#: ../src/protocols/silc/util.c:532
+#: ../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:534
+#: ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707
+#: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
 msgstr "Video-konferenca"
 
-#: ../src/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Vaše trenutno stanje"
 
-#: ../src/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Storitve na zvezi"
 
-#: ../src/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Naj ostali vidijo, katere storitve uporabljate"
 
-#: ../src/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Naj ostali vidijo, kakšen računalnik uporabljate"
 
-#: ../src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Vaša datoteka VCard"
 
-#: ../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 "Atributi stanja uporabnika na zvezi"
 
-#: ../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 about yourself."
 msgstr "Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim uporabnikom."
 
-#: ../src/protocols/silc/silc.c:789
-#: ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1434
+#: ../libgaim/protocols/silc/silc.c:785
+#: ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "Sporočilo dneva"
 
-#: ../src/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: ../src/protocols/silc/silc.c:790
-#: ../src/protocols/silc/silc.c:1429
+#: ../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 "S to povezavo ni povezano nobeno sporočilo dneva"
 
-#: ../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 "Ustvari nov par ključev SILC"
 
-#: ../src/protocols/silc/silc.c:841
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "Gesli se ne ujemata"
 
-#: ../src/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "Ustvarjanje para ključev ni uspelo"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "Dolžina ključa"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../src/protocols/silc/silc.c:951
+#: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: ../src/protocols/silc/silc.c:958
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "Ustvari par ključev"
 
-#: ../src/protocols/silc/silc.c:1002
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "Stanje na zvezi"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "Ogled sporočila dneva"
 
-#: ../src/protocols/silc/silc.c:1015
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "Ustvari par ključev SILC ..."
 
-#: ../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 "Uporabnik <I>%s</I> ni prisoten v omrežju"
 
-#: ../src/protocols/silc/silc.c:1305
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: ../src/protocols/silc/silc.c:1386
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "Določiti morate vzdevek"
 
-#: ../src/protocols/silc/silc.c:1488
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogoče najti"
 
-#: ../src/protocols/silc/silc.c:1493
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "načini kanala za %s: %s"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "načini kanala za %s niso nastavljeni"
 
-#: ../src/protocols/silc/silc.c:1508
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogoče nastaviti načinov za %s"
 
-#: ../src/protocols/silc/silc.c:1538
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Neznan ukaz: %s, (morda hrošč v Gaimu)"
 
-#: ../src/protocols/silc/silc.c:1601
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: ../src/protocols/silc/silc.c:1605
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: ../src/protocols/silc/silc.c:1609
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Ogled ali sprememba teme"
 
-#: ../src/protocols/silc/silc.c:1614
+#: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
 
-#: ../src/protocols/silc/silc.c:1618
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
 msgstr "list:  Seznam kanalov na tem omrežju"
 
-#: ../src/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
 
-#: ../src/protocols/silc/silc.c:1626
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../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;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
 
-#: ../src/protocols/silc/silc.c:1630
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo uporabniku"
 
-#: ../src/protocols/silc/silc.c:1634
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ogled sporočila dneva na strežniku"
 
-#: ../src/protocols/silc/silc.c:1638
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
 msgstr "odpni:  Odpni to sejo"
 
-#: ../src/protocols/silc/silc.c:1642
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporočilo]:  Prekini povezavo s strežnikom z možnostjo sporočila"
 
-#: ../src/protocols/silc/silc.c:1646
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu"
 
-#: ../src/protocols/silc/silc.c:1652
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniključ|&lt;razlog&gt;]:  Ubij vzdevek"
 
-#: ../src/protocols/silc/silc.c:1656
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
 
-#: ../src/protocols/silc/silc.c:1660
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
 
-#: ../src/protocols/silc/silc.c:1664
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;kanall&gt; [+|-&lt;načini&gt;] [argumenti]:  Spremeni ali prikaži načine kanala"
 
-#: ../src/protocols/silc/silc.c:1668
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
 msgstr "cumode &lt;kanal&gt; +|-&lt;načini&gt; &lt;vzdevek&gt;:  Spremeni načine vzdevka na kanalu"
 
-#: ../src/protocols/silc/silc.c:1672
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;načiniuporabnika&gt;:  Nastavite vaše načine v omrežju"
 
-#: ../src/protocols/silc/silc.c:1676
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
 
-#: ../src/protocols/silc/silc.c:1680
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
 msgstr "invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/odstrani iz seznama povabljenih na kanal"
 
-#: ../src/protocols/silc/silc.c:1684
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
 
-#: ../src/protocols/silc/silc.c:1688
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [strežnik]:  Ogled skrbniških podrobnosti strežnika"
 
-#: ../src/protocols/silc/silc.c:1692
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;vzdevek&gt;]:  Prepovaj odjemalca na kanalu"
 
-#: ../src/protocols/silc/silc.c:1696
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
 
-#: ../src/protocols/silc/silc.c:1700
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omrežja in strežnika"
 
-#: ../src/protocols/silc/silc.c:1704
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Pošlji PING povezanemu strežniku"
 
-#: ../src/protocols/silc/silc.c:1709
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: ../src/protocols/silc/silc.c:1713
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
 msgstr "names [-št|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam določenih uporabnikov na kanalu(ih)"
 
@@ -11714,112 +13486,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1822
+#: ../libgaim/protocols/silc/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1824
+#: ../libgaim/protocols/silc/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: ../src/protocols/silc/silc.c:1861
+#: ../libgaim/protocols/silc/silc.c:1858
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../src/protocols/silc/silc.c:1865
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../src/protocols/silc/silc.c:1875
+#: ../libgaim/protocols/silc/silc.c:1872
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../libgaim/protocols/silc/silc.c:1882
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1885
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../libgaim/protocols/silc/silc.c:1888
 msgid "Reject watching by other users"
 msgstr "Zavrni ogledovanje drugih uporabnikov"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../libgaim/protocols/silc/silc.c:1891
 msgid "Block invites"
 msgstr "Zavrni povabljene"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../libgaim/protocols/silc/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../libgaim/protocols/silc/silc.c:1897
 msgid "Reject online status attribute requests"
 msgstr "Zavrni zahtevke atributov stanja uporabnikov na zvezi"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../libgaim/protocols/silc/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Blokiraj sporočila na tablo"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../libgaim/protocols/silc/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Samodejno odpri tablo"
 
-#: ../src/protocols/silc/silc.c:1909
+#: ../libgaim/protocols/silc/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Digitalno podpiši in preveri vsa sporočila"
 
-#: ../src/protocols/silc/util.c:207
-#: ../src/protocols/silc/util.c:233
+#: ../libgaim/protocols/silc/util.c:207
+#: ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
 #. 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:328
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Pravo ime: \t%s\n"
 
-#: ../src/protocols/silc/util.c:330
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Uporabniško ime: \t%s\n"
 
-#: ../src/protocols/silc/util.c:332
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ime gostitelja: \t%s\n"
 
-#: ../src/protocols/silc/util.c:336
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: ../src/protocols/silc/util.c:338
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Država: \t%s\n"
 
-#: ../src/protocols/silc/util.c:339
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritem: \t%s\n"
 
-#: ../src/protocols/silc/util.c:340
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Dolžina ključa: \t%d bitov\n"
 
-#: ../src/protocols/silc/util.c:342
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11830,7 +13602,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:343
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11839,71 +13611,75 @@
 "Odtis javnega ključa:\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:347
-#: ../src/protocols/silc/util.c:348
+#: ../libgaim/protocols/silc/util.c:374
+#: ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Informacije o javnem ključu"
 
-#: ../src/protocols/silc/util.c:530
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "Ostranjevanje"
 
-#: ../src/protocols/silc/util.c:536
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "Video-konferenca"
 
-#: ../src/protocols/silc/util.c:554
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Računalnik"
 
-#: ../src/protocols/silc/util.c:558
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:560
+#: ../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 je poslal sporočilo na tablo. Želite odpreti tablo?"
 
-#: ../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 whiteboard?"
 msgstr "%s je poslal sporočilo na tablo v kanalu %s. Želite odpreti tablo?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "Tabla"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:411
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Ni mogoče pisati"
 
-#: ../src/protocols/simple/simple.c:426
-#: ../src/protocols/simple/simple.c:1425
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "Povezava ni uspela"
 
-#: ../src/protocols/simple/simple.c:997
+#: ../libgaim/protocols/simple/simple.c:1035
 msgid "Wrong Password"
 msgstr "Napačno geslo"
 
-#: ../src/protocols/simple/simple.c:1456
-#: ../src/protocols/simple/simple.c:1495
-#: ../src/protocols/simple/simple.c:1507
-#: ../src/protocols/simple/simple.c:1565
+#: ../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 "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../src/protocols/simple/simple.c:1477
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: ../src/protocols/simple/simple.c:1587
+#: ../libgaim/protocols/simple/simple.c:1630
+msgid "Could not resolve hostname"
+msgstr "Imena strežnika ni mogoče razločiti"
+
+#: ../libgaim/protocols/simple/simple.c:1647
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -11915,231 +13691,235 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1749
+#: ../libgaim/protocols/simple/simple.c:1815
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1750
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1772
+#: ../libgaim/protocols/simple/simple.c:1838
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../libgaim/protocols/simple/simple.c:1844
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: ../src/protocols/simple/simple.c:1780
+#: ../libgaim/protocols/simple/simple.c:1846
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: ../src/protocols/simple/simple.c:1782
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Auth User"
 msgstr "Avtoriziraj uporabnika"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Poizvedujem za %s"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Povezovanje na %s ni uspelo"
 
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijavljanje: %s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datoteke %s ni bilo mogoče zapisati."
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datoteke %s ni bilo mogoče prebrati."
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s trenutno ni prijavljen."
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Opozarjanje %s ni dovoljeno."
 
-#: ../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 "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Pomenek v %s ni dostopen."
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Prehitro pošiljate sporočila %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 "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
 
-#: ../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 "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Neuspeh."
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Preveč zadetkov."
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Potrebujem več selekcije."
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Ključna beseda zanemarjena."
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Brez ključnih besed."
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Uporabnik nima imeniških informacij."
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Država ni podprta."
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznan vzrok neuspeha: %s."
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Neveljaven vzdevek ali geslo."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Storitev je trenutno nedostopna."
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
-#: ../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."
 msgstr "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Pri prijavljanju je prišlo do neznane napake: %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 "Prišlo je do neznane napake %d. Info: %s"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Neveljavno ime skupine"
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Povezava zaprta"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Čakanje odgovora ..."
 
-#: ../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 je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Sprememba gesla uspešna"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC je poslal ukaz PAUSE."
 
-#: ../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 is only temporary, please be patient."
 msgstr "Ko se to pripeti, TOC prezre vsa poslana sporočila in vas lahko celo brcne s kanala če pošljete sporočilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je le začasno, prosim potrpite."
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "_Skupina:"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "Prikaži imeniške podatke"
 
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "Nastavi imeniške podatke"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Spremeni geslo"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Ne morem odpreti %s za pisanje!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
 
-#: ../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 "Ni se bilo mogoče povezati za prenos."
 
-#: ../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 "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - Shrani kot ..."
 
-#: ../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"
@@ -12148,7 +13928,7 @@
 msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
 msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %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 zahteva, da jim pošljete datoteko"
@@ -12163,21 +13943,21 @@
 #. *< 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 "Dodatek za protokol TOC"
 
-#: ../src/protocols/yahoo/yahoo.c:710
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: ../src/protocols/yahoo/yahoo.c:764
-#: ../src/protocols/yahoo/yahoo.c:3564
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
-#: ../src/protocols/yahoo/yahoo.c:809
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
@@ -12185,200 +13965,193 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:905
+#: ../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 "Uporabnik %s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:911
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "Sporočilo (dodatno):"
 
-#: ../src/protocols/yahoo/yahoo.c:953
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
 
-#: ../src/protocols/yahoo/yahoo.c:956
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da bi ga dodali na svoj seznam prijateljev zaradi naslednjega razloga: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: ../src/protocols/yahoo/yahoo.c:1702
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Ta različica Gaima se verjetno ne bo uspešno prijavila na Yahoo. Preverite %s za posodobitve."
 
-#: ../src/protocols/yahoo/yahoo.c:1705
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1771
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "Poskusili ste prezreti uporabnika %s, ki je na vašem seznamu prijateljev. Če kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
 
-#: ../src/protocols/yahoo/yahoo.c:1774
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: ../src/protocols/yahoo/yahoo.c:1808
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Neveljavno uporabniško ime."
 
-#: ../src/protocols/yahoo/yahoo.c:1819
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Navadna overovitev ni uspela!"
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../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 attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
 msgstr "Navadna metoda overovitve je spodletela. To lahko pomeni, da je napačno vaše geslo ali pa se je spremenila shema overovitve Yahoo! Gaim se bo zdaj poskušal prijaviti z uporabo overovitve Web Messengerja, kar se bo odrazilo v manj možnostih."
 
-#: ../src/protocols/yahoo/yahoo.c:1828
-msgid "Incorrect password."
-msgstr "Neveljavno geslo."
-
-#: ../src/protocols/yahoo/yahoo.c:1831
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1834
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to odpravi."
 
-#: ../src/protocols/yahoo/yahoo.c:1888
+#: ../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 "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1891
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: ../src/protocols/yahoo/yahoo.c:2010
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2149
-#: ../src/protocols/yahoo/yahoo.c:2296
-#: ../src/protocols/yahoo/yahoo.c:2311
-#: ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Ni mogoče brati"
-
-#: ../src/protocols/yahoo/yahoo.c:2335
-#: ../src/protocols/yahoo/yahoo.c:2492
-#: ../src/protocols/yahoo/yahoo.c:2594
-#: ../src/protocols/yahoo/yahoo.c:2604
-#: ../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 "Prejet neveljaven odgovor HTTP strežnika."
+
+#: ../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 "Težava s povezavo"
 
-#: ../src/protocols/yahoo/yahoo.c:2711
-#: ../src/protocols/yahoo/yahoo.c:3298
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: ../src/protocols/yahoo/yahoo.c:2713
-#: ../src/protocols/yahoo/yahoo.c:3301
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: ../src/protocols/yahoo/yahoo.c:2715
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: ../src/protocols/yahoo/yahoo.c:2719
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: ../src/protocols/yahoo/yahoo.c:2723
-#: ../src/protocols/yahoo/yahoo.c:3316
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: ../src/protocols/yahoo/yahoo.c:2816
-#: ../src/protocols/yahoo/yahoo.c:2846
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: ../src/protocols/yahoo/yahoo.c:2863
-#: ../src/protocols/yahoo/yahoo.c:2922
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: ../src/protocols/yahoo/yahoo.c:2866
-#: ../src/protocols/yahoo/yahoo.c:2943
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: ../src/protocols/yahoo/yahoo.c:2885
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: ../src/protocols/yahoo/yahoo.c:2928
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../src/protocols/yahoo/yahoo.c:2937
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../src/protocols/yahoo/yahoo.c:2985
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../src/protocols/yahoo/yahoo.c:2991
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: ../src/protocols/yahoo/yahoo.c:3019
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: ../src/protocols/yahoo/yahoo.c:3025
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: ../src/protocols/yahoo/yahoo.c:3057
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: ../src/protocols/yahoo/yahoo.c:3066
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: ../src/protocols/yahoo/yahoo.c:3076
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: ../src/protocols/yahoo/yahoo.c:3623
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
 
-#: ../src/protocols/yahoo/yahoo.c:3628
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3632
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pozvonite (buzznite) pri prijatelju, da vas bo opazil"
 
-#: ../src/protocols/yahoo/yahoo.c:3636
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -12392,322 +14165,331 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3729
-#: ../src/protocols/yahoo/yahoo.c:3731
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3748
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: ../src/protocols/yahoo/yahoo.c:3751
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
 msgid "Pager server"
 msgstr "Strežnik pozivnika"
 
-#: ../src/protocols/yahoo/yahoo.c:3754
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
 msgid "Japan Pager server"
 msgstr "Japonski strežnik pozivnika"
 
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: ../src/protocols/yahoo/yahoo.c:3760
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
 msgstr "Strežnik prenosa datotek"
 
-#: ../src/protocols/yahoo/yahoo.c:3763
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
 msgid "Japan file transfer server"
 msgstr "Japonski strežnik prenosa datotek"
 
-#: ../src/protocols/yahoo/yahoo.c:3766
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: ../src/protocols/yahoo/yahoo.c:3769
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: ../src/protocols/yahoo/yahoo.c:3772
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: ../src/protocols/yahoo/yahoo.c:3776
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: ../src/protocols/yahoo/yahoo.c:3779
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
 msgid "Yahoo Chat server"
 msgstr "Strežnik klepeta Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3782
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Povabilo zavrnjeno"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Pomenku se ni mogoče pridružiti"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Neznana soba"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Morda je soba polna"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Ni na voljo"
+
+#: ../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 "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Pogovarjate se v %s."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Morda niso v pomenku?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Prejemanje seznama sob je spodletelo."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Glasovi"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Spletne kamere"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Ni mogoče prenesti seznama sob."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Sobe uporabnikov"
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+#: ../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 "Opisa datoteke ni bilo mogoče vzpostaviti."
 
 #. 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 "Napaka pri pisanju"
 
-#: ../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>Naslov IP:</b> %s<br>"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../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."
 msgstr "Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
 
-#: ../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"
 msgstr "Če si želite ogledati ta profil, morate obiskati to povezavo z vašim spletnim brskalnikom"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
 msgid "Yahoo! ID"
 msgstr "Yahoo ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
 msgid "Latest News"
 msgstr "Zadnje novice"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
 msgid "Home Page"
 msgstr "Domača stran"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
 msgid "Cool Link 1"
 msgstr "Zanimiva povezava št. 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Cool Link 2"
 msgstr "Zanimiva povezava št. 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
 msgid "Cool Link 3"
 msgstr "Zanimiva povezava št. 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
 msgid "Last Update"
 msgstr "Nazadnje osveženo"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podatki o uporabniku %s niso dostopni"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
+#: ../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."
 msgstr "Oprostite, profil je v jeziku ali obliki, ki trenutno ni podprta."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
+#: ../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."
 msgstr "Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo na strežniku. Poskusite pozneje."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
+#: ../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 profile. If you know that the user exists, please try again later."
 msgstr "Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. Če veste, da uporabnik obstaja, poskusite pozneje."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
 msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Povabilo zavrnjeno"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Pomenku se ni mogoče pridružiti"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Neznana soba"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Morda je soba polna"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Ni na voljo"
-
-#: ../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 "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Pogovarjate se v %s."
-
-#: ../src/protocols/yahoo/yahoochat.c:626
-msgid "Failed to join buddy in chat"
-msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Maybe they're not in a chat?"
-msgstr "Morda niso v pomenku?"
-
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Fetching the room list failed."
-msgstr "Prejemanje seznama sob je spodletelo."
-
-#: ../src/protocols/yahoo/yahoochat.c:1433
-msgid "Voices"
-msgstr "Glasovi"
-
-#: ../src/protocols/yahoo/yahoochat.c:1436
-msgid "Webcams"
-msgstr "Spletne kamere"
-
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
-msgid "Unable to fetch room list."
-msgstr "Ni mogoče prenesti seznama sob."
-
-#: ../src/protocols/yahoo/yahoochat.c:1510
-msgid "User Rooms"
-msgstr "Sobe uporabnikov"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Težava s povezavo s strežnikom YCHT."
 
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Izgubljena povezava s strežnikom\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)"
 msgstr "(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro kodnega nabora v Upravitelju računov)"
 
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ni mogoče poslati klepetu %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:734
-#: ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uporabnik:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:738
-#: ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrit ali neprijavljen"
 
-#: ../src/protocols/zephyr/zephyr.c:743
-#: ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Pri %s od %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1490
-#: ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Razred:"
 
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "_Primer:"
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "_Prejemnik:"
 
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poskus prijave na %s,%s,%s je spodletel"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu klepetu"
 
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../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;"
 msgstr "zci &lt;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../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;"
 msgstr "zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../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;"
 msgstr "zir &lt;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "Ponovna prijava"
 
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "Pridobi prijave s strežnika"
 
@@ -12721,81 +14503,107 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2875
-#: ../src/protocols/zephyr/zephyr.c:2877
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatek za protokol Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2896
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
 msgstr "Uporabi tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2899
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
 msgstr "ukaz tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2902
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "Izvozi v .kdorkoli"
 
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "Izvozi v .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "Uvozi iz .kdorkoli"
 
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "Uvozi iz .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2914
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
 msgstr "Področje"
 
-#: ../src/protocols/zephyr/zephyr.c:2917
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#: ../src/proxy.c:1217
-#: ../src/proxy.c:1273
-#: ../src/proxy.c:1321
-#: ../src/proxy.c:1348
-#, c-format
-msgid "Proxy connection error %d"
+#: ../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 ""
+"Ni mogoče ustvariti vtičnice:\n"
+"%s"
+
+#  Data is assumed to be the destination sn
+#: ../libgaim/proxy.c:644
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
+
+#: ../libgaim/proxy.c:672
+#: ../libgaim/proxy.c:718
+#: ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
+#, fuzzy, c-format
+msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi strežnika proxy %d"
 
-#. Forbidden
-#: ../src/proxy.c:1337
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Dostop zavrnjen: strežnik proxy ne dovoljuje tuneliranja vrat %d."
+#: ../libgaim/proxy.c:764
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Dostop zavrnjen: strežnik proxy HTTP ne dovoljuje preusmerjanja vrat %d."
+
+#: ../libgaim/proxy.c:984
+#, c-format
+msgid "Error resolving %s"
+msgstr "Napaka pri razločanju %s"
+
+#: ../libgaim/proxy.c:1673
+msgid "Could not resolve host name"
+msgstr "Imena strežnika ni možno razločiti"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
+#: ../libgaim/request.h:1354
 msgid "_Accept"
 msgstr "_Sprejmi"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:45
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Trenutno nisem tukaj"
 
-#: ../src/savedstatuses.c:524
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
-#: ../src/server.c:227
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: ../src/server.c:681
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12804,86 +14612,86 @@
 "Uporabnik %s vabi %s na pomenek v sobo %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 "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: ../src/server.c:690
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "Nenastavljeno"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "Nedostopen"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../src/status.c:622
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s je spremenil stanje iz %s v %s"
 
-#: ../src/status.c:632
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s je zdaj %s"
 
-#: ../src/status.c:637
+#: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ni nič več %s"
 
-#: ../src/status.c:1311
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: ../src/status.c:1328
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: ../src/status.c:1394
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s je postal nedejaven"
 
-#: ../src/status.c:1396
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2453
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../src/util.c:2454
+#: ../libgaim/util.c:2430
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: ../src/util.c:2903
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../src/util.c:2906
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../src/util.c:2932
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -12892,7 +14700,7 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../src/util.c:2944
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -12901,7 +14709,7 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -12910,7 +14718,7 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../src/util.c:2958
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -12919,7 +14727,7 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -12928,7 +14736,7 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../src/util.c:2972
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -12937,7 +14745,29 @@
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../src/util.c:3439
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Napaka pri vzpostavljanju povezave.\n"
-
+#: ../libgaim/util.c:3161
+#: ../libgaim/util.c:3460
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Ni se mogoče povezati z %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 ""
+
+#: ../libgaim/util.c:3324
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Napaka pri branju iz %s: %s"
+
+#: ../libgaim/util.c:3355
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Napaka pri pisanju v %s: %s"
+
+#: ../libgaim/util.c:3380
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Napaka pri povezovanju z %s: %s"
+