Mercurial > pidgin

changeset 4663:788f78343113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4974] Updates to the Korean translation by Son Kyung-uk(hey). Thanks! committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Fri, 07 Mar 2003 07:01:44 +0000
parents 6d8a3e81db48
children eab1309693b8
files gaim.desktop po/ko.po
diffstat 2 files changed, 3110 insertions(+), 2699 deletions(-) [+]
line wrap: on
line diff
--- a/gaim.desktop	Fri Mar 07 06:39:10 2003 +0000
+++ b/gaim.desktop	Fri Mar 07 07:01:44 2003 +0000
@@ -5,6 +5,7 @@
 Comment[es]=Cliente de mensajería instantánea multiprotocolo
 Comment[fr]=Client de messagerie instantanée multiprotocole
 Comment[de]=Multi-Protokoll Instant Messenger Client
+Comment[ko]=멀티 프로토콜 인스턴트 메시징 클라이언트
 Exec=gaim
 Icon=gaim.png
 Terminal=false
--- a/po/ko.po	Fri Mar 07 06:39:10 2003 +0000
+++ b/po/ko.po	Fri Mar 07 07:01:44 2003 +0000
@@ -3,136 +3,167 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.59.3\n"
-"POT-Creation-Date: 2003-01-05 12:23-0500\n"
-"PO-Revision-Date: 2002-10-02 07:32+0900\n"
-"Last-Translator: A Lee <alee@debian.org>\n"
-"Language-Team: artsilly and alee team\n"
+"Project-Id-Version: gaim 0.60CVS\n"
+"POT-Creation-Date: 2003-03-03 11:20+0900\n"
+"PO-Revision-Date: 2003-03-03 12:03+0900\n"
+"Last-Translator: Son Kyung-uk(hey) <vvs740@chol.com>\n"
+"Language-Team: GnomeKorea(http://gnome.or.kr)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/docklet/docklet.c:119
+#: plugins/docklet/docklet.c:96 src/multi.c:273 src/win32/systray.c:305
+msgid "Auto-login"
+msgstr "ڵ α"
+
+#: plugins/docklet/docklet.c:101
+msgid "New Message.."
+msgstr " ޽.."
+
+#: plugins/docklet/docklet.c:102
+msgid "Join A Chat..."
+msgstr "ä ..."
+
+#: plugins/docklet/docklet.c:133
 msgid "New..."
 msgstr ""
 
-#: plugins/docklet/docklet.c:123 src/buddy.c:499 src/buddy.c:2532
-#: src/buddy.c:2662 src/prefs.c:731 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1165
+#: plugins/docklet/docklet.c:137 src/protocols/gg/gg.c:76
+#: src/protocols/jabber/jabber.c:1173 src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:4059 src/protocols/oscar/oscar.c:5094
+#: src/buddy.c:401 src/buddy.c:2374 src/buddy.c:2520 src/prefs.c:1042
 msgid "Away"
 msgstr "ڸ"
 
-#: plugins/docklet/docklet.c:129 src/away.c:485
+#: plugins/docklet/docklet.c:143 src/away.c:519
 msgid "Back"
 msgstr "ڷ"
 
-#: plugins/docklet/docklet.c:138 src/multi.c:255
-msgid "Auto-login"
-msgstr "ڵ α"
-
-#: plugins/docklet/docklet.c:143 src/buddy.c:2648
-msgid "Signoff"
-msgstr " "
-
 #: plugins/docklet/docklet.c:151
-#, fuzzy
 msgid "Mute Sounds"
-msgstr "Ҹ"
+msgstr "Ұ"
 
 #: plugins/docklet/docklet.c:156
-#, fuzzy
-msgid "Accounts..."
-msgstr ""
+msgid "File Transfers..."
+msgstr " ..."
 
 #: plugins/docklet/docklet.c:157
-#, fuzzy
+msgid "Accounts..."
+msgstr "..."
+
+#: plugins/docklet/docklet.c:158
 msgid "Preferences..."
-msgstr "ȯ漳"
-
-#: plugins/docklet/docklet.c:161
-#, fuzzy
-msgid "About Gaim..."
-msgstr "..."
-
-#: plugins/docklet/docklet.c:162 src/buddy.c:2652
+msgstr "⺻ ..."
+
+#: plugins/docklet/docklet.c:167 src/buddy.c:2506 src/win32/systray.c:118
+msgid "Signoff"
+msgstr " "
+
+#: plugins/docklet/docklet.c:173 src/buddy.c:2510
 msgid "Quit"
 msgstr ""
 
-#: plugins/docklet/docklet.c:400
-#, fuzzy
+#: plugins/docklet/docklet.c:480
 msgid "Tray Icon Configuration"
-msgstr " - Ҹ "
+msgstr "Ʈ  "
 
 #. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:409
+#: plugins/docklet/docklet.c:489
 msgid "_Hide new messages until tray icon is clicked"
 msgstr ""
 
-#: plugins/docklet/docklet.c:421
-#, fuzzy
-msgid "Tray Icon"
-msgstr "ģ "
-
-#: plugins/docklet/docklet.c:423 plugins/docklet/docklet.c:434
+#: plugins/docklet/docklet.c:501 plugins/docklet/docklet.c:510
+msgid "System Tray Icon"
+msgstr "ý Ʈ "
+
+#: plugins/docklet/docklet.c:503 plugins/docklet/docklet.c:514
 msgid ""
-"Interacts with a System Tray applet (in GNOME or KDE, for example) to "
+"Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
 "functions, and to toggle display of the buddy list or login window. Also "
-"allows messages to be queued until the icon is clicked, similar to ICQ "
-"(although the icon doesn't flash yet =)."
-msgstr ""
-
-#: plugins/docklet/docklet.c:424
-msgid "Robert McQueen &lt;robot101@debian.org>"
-msgstr ""
-
-#: plugins/docklet/docklet.c:430
-msgid "System Tray Icon"
-msgstr ""
-
-#: plugins/chatlist.c:72 src/buddy_chat.c:275
+"allows messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+
+#: plugins/ticker/ticker.c:96
+msgid "Gaim - Buddy Ticker"
+msgstr "Gaim - ģ Ȯα"
+
+#: plugins/ticker/ticker.c:414 plugins/ticker/ticker.c:440
+msgid "Buddy Ticker"
+msgstr "ģ Ȯα"
+
+#: plugins/ticker/ticker.c:418 plugins/ticker/ticker.c:442
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "ģ   帣 "
+
+#: plugins/autorecon.c:58
+msgid "Autoreconnect"
+msgstr "ڵ 翬"
+
+#: plugins/autorecon.c:60 plugins/autorecon.c:71
+msgid "When you are kicked offline, this reconnects you."
+msgstr "  մϴ."
+
+#: plugins/autorecon.c:67
+msgid "Auto Reconnect"
+msgstr "ڵ 翬"
+
+#: plugins/chatlist.c:78 src/buddy_chat.c:264
 msgid "Buddy Chat"
 msgstr "ä"
 
-#: plugins/chatlist.c:163 plugins/chatlist.c:165 plugins/chatlist.c:355
-#: plugins/chatlist.c:357
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:358
+#: plugins/chatlist.c:360
 msgid "Gaim Chat"
-msgstr " - ä"
-
-#: plugins/chatlist.c:306
+msgstr " ä"
+
+#: plugins/chatlist.c:309
 msgid "Chat Rooms"
 msgstr "ä ɼ"
 
-#: plugins/chatlist.c:318
+#: plugins/chatlist.c:321
 msgid "Refresh"
 msgstr "ΰħ"
 
 #. buttons
-#: plugins/chatlist.c:319 src/buddy.c:494 src/buddy.c:2760
-#: src/buddy_chat.c:902 src/buddy_chat.c:1580 src/conversation.c:2309
-#: src/conversation.c:2896 src/dialogs.c:2588 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2174 src/prpl.c:638
+#: plugins/chatlist.c:322 src/protocols/icq/gaim_icq.c:284
+#: src/protocols/oscar/oscar.c:2420 src/buddy.c:396 src/buddy.c:2621
+#: src/dialogs.c:2566 src/gtkconv.c:784 src/gtkconv.c:2520 src/gtkconv.c:3561
+#: src/prpl.c:674
 msgid "Add"
-msgstr "߰"
-
-#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
-#: src/buddy_chat.c:900 src/buddy_chat.c:1582 src/conversation.c:2293
-#: src/conversation.c:2890
+msgstr "ϱ"
+
+#: plugins/chatlist.c:323 src/buddy.c:398 src/buddy.c:2623 src/gtkconv.c:782
+#: src/gtkconv.c:2526 src/gtkconv.c:3552
 msgid "Remove"
-msgstr ""
-
-#: plugins/chatlist.c:336
+msgstr ""
+
+#: plugins/chatlist.c:339
 msgid "List of available chats"
 msgstr "밡 ä "
 
-#: plugins/chatlist.c:346
+#: plugins/chatlist.c:349
 msgid "List of subscribed chats"
 msgstr " ä "
 
+#: plugins/chatlist.c:413 plugins/chatlist.c:423
+msgid "Chat List"
+msgstr "ä "
+
+#: plugins/chatlist.c:415
+msgid "Allows you to add chat rooms to your buddy list."
+msgstr "ģ Ͽ ȭ   ֵ  մϴ."
+
+#: plugins/chatlist.c:428
+msgid ""
+"Allows you to add chat rooms to your buddy list. Click the configure button "
+"to choose which rooms."
+msgstr ""
+
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "׳  ü ǥñ ȯ "
@@ -148,477 +179,626 @@
 #. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
-msgstr "ȣ ݸ ǥ"
+msgstr "ȣ ݸ ֱ:"
 
 #: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
-msgstr "ʿ  ũ"
+msgstr "ʿ  ũ:"
 
 #: plugins/gtik.c:994
 msgid "(No"
-msgstr ""
+msgstr "("
 
 #: plugins/gtik.c:995
 msgid "Change"
-msgstr ""
-
-#: plugins/notify.c:389
-#, fuzzy
+msgstr "ٲٱ"
+
+#: plugins/history.c:76
+msgid "History"
+msgstr "ȭ "
+
+#: plugins/history.c:78
+msgid "Shows recently logged conversations in new conversations "
+msgstr " ȭ    "
+
+#: plugins/iconaway.c:68 plugins/iconaway.c:77
+msgid "Iconify on away"
+msgstr "ڸ  ǥ"
+
+#: plugins/iconaway.c:70 plugins/iconaway.c:81
+msgid "Iconifies the away box and the buddy list when you go away."
+msgstr "ڸ   ڸ â ģ Ͽ  ǥմϴ."
+
+#: plugins/idle.c:19 plugins/idle.c:81
+msgid "I'dle Mak'er"
+msgstr ""
+
+#: plugins/idle.c:23 plugins/idle.c:83
+msgid "Allows you to hand-configure how long you've been idle for"
+msgstr ""
+
+#: plugins/idle.c:99
+msgid "Idle Time"
+msgstr "  ð"
+
+#: plugins/idle.c:107 src/prefs.c:907
+msgid "Set"
+msgstr ""
+
+#: plugins/idle.c:112
+msgid "idle for"
+msgstr ""
+
+#: plugins/idle.c:119 plugins/timestamp.c:86
+msgid "minutes."
+msgstr "."
+
+#: plugins/idle.c:125
+msgid "_Set"
+msgstr "(_S)"
+
+#: plugins/notify.c:428
 msgid "Unable to write to config file"
-msgstr "%s Ͽ   ϴ."
-
-#: plugins/notify.c:389
-#, fuzzy
+msgstr "    "
+
+#: plugins/notify.c:428
 msgid "Notify plugin"
-msgstr "ӵ "
-
-#: plugins/notify.c:561
+msgstr "Notify ÷"
+
+#: plugins/notify.c:586 plugins/notify.c:595
+msgid "Message Notification"
+msgstr "޽ ˸"
+
+#: plugins/notify.c:588 plugins/notify.c:599
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "  ޽ ˸    մϴ."
+
+#: plugins/notify.c:609
 msgid "Notify For"
-msgstr ""
-
-#: plugins/notify.c:562
-#, fuzzy
+msgstr "  ˸"
+
+#: plugins/notify.c:610
 msgid "_IM windows"
-msgstr "޽ â"
-
-#: plugins/notify.c:567
-#, fuzzy
+msgstr "޽ â(_I)"
+
+#: plugins/notify.c:615
 msgid "_Chat windows"
-msgstr "׷ ä â"
+msgstr "ä â(_C)"
 
 #. --------------
-#: plugins/notify.c:573
-#, fuzzy
+#: plugins/notify.c:621
 msgid "Notification Methods"
-msgstr "˾â  "
-
-#: plugins/notify.c:576
+msgstr "˸ "
+
+#: plugins/notify.c:624
 msgid "Prepend _string into window title (hit enter to save):"
-msgstr ""
-
-#: plugins/notify.c:587
-#, fuzzy
+msgstr "â ٿ  ڿ(_S):"
+
+#: plugins/notify.c:635
 msgid "_Quote window title"
-msgstr " ȭâ  ũ"
-
-#: plugins/notify.c:592
+msgstr "â  ο(_Q)"
+
+#: plugins/notify.c:640
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr ""
 
-#: plugins/notify.c:597
+#: plugins/notify.c:645
 msgid "Insert c_ount of new messages into window title"
-msgstr ""
-
-#: plugins/notify.c:602
+msgstr "â    ޽  (_O)"
+
+#: plugins/notify.c:650
 msgid "_Notify even if conversation is in focus"
 msgstr ""
 
 #. --------------
-#: plugins/notify.c:608
-#, fuzzy
+#: plugins/notify.c:656
 msgid "Notification Removal"
-msgstr "˾â  "
-
-#: plugins/notify.c:609
+msgstr "˸ ֱ"
+
+#: plugins/notify.c:657
 msgid "Remove when conversation window gains _focus"
-msgstr ""
-
-#: plugins/notify.c:614
+msgstr "ȭ â Ŀ  (_F)"
+
+#: plugins/notify.c:662
 msgid "Remove when conversation window _receives click"
-msgstr ""
-
-#: plugins/notify.c:619
+msgstr "ȭâ Ŭϸ (_R)"
+
+#: plugins/notify.c:667
 msgid "Remove when _typing in conversation window"
-msgstr ""
-
-#: plugins/notify.c:624
+msgstr "ȭâ ޽ Էϸ (_T)"
+
+#: plugins/notify.c:672
 msgid "Appl_y"
-msgstr ""
-
-#: plugins/autorecon.c:54 plugins/autorecon.c:65
-msgid "When you are kicked offline, this reconnects you."
-msgstr ""
-
-#: plugins/autorecon.c:61
+msgstr "(_Y)"
+
+#: plugins/spellchk.c:399 plugins/spellchk.c:408
+msgid "Text replacement"
+msgstr "ؽƮ ȯ"
+
+#: plugins/spellchk.c:401 plugins/spellchk.c:412
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+#: plugins/spellchk.c:429
+msgid "Text Replacements"
+msgstr "ؽƮ ȯ"
+
+#: plugins/spellchk.c:451
+msgid "You type"
+msgstr ""
+
+#: plugins/spellchk.c:463
+#, fuzzy
+msgid "You send"
+msgstr "Ҹ"
+
+#: plugins/spellchk.c:489
+msgid "Add a new text replacement"
+msgstr ""
+
+#: plugins/spellchk.c:496
 #, fuzzy
-msgid "Auto Reconnect"
-msgstr "  ϴ"
-
-#: plugins/timestamp.c:73
-#, fuzzy
+msgid "You _type:"
+msgstr "Ͻ (_T):"
+
+#: plugins/spellchk.c:510
+msgid "You _send:"
+msgstr ""
+
+#: plugins/timestamp.c:72
+msgid "iChat Timestamp"
+msgstr "iChat Ÿӽ"
+
+#: plugins/timestamp.c:79
+msgid "Delay"
+msgstr ""
+
+#: plugins/timestamp.c:92
+msgid "_Apply"
+msgstr "(_A)"
+
+#: plugins/timestamp.c:129
 msgid "Timestamp"
-msgstr "׽Ʈ"
-
-#: plugins/timestamp.c:75
-msgid "Adds iChat-style timestamps to conversations every 5 minutes."
-msgstr ""
-
-#: plugins/history.c:72
-msgid "History"
-msgstr ""
-
-#: plugins/history.c:74
+msgstr "ð"
+
+#: plugins/timestamp.c:131
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr " и iChat ŸϷ ȭâ ð ǥմϴ."
+
+#. Configuration frame
+#: plugins/gestures/gestures.c:212
+msgid "Mouse Gestures Configuration"
+msgstr "콺  "
+
+#: plugins/gestures/gestures.c:219
+msgid "Middle mouse button"
+msgstr "콺  "
+
+#: plugins/gestures/gestures.c:224
+msgid "Right mouse button"
+msgstr "콺  "
+
+#. "Visual gesture display" checkbox
+#: plugins/gestures/gestures.c:236
+msgid "_Visual gesture display"
+msgstr "־ϰ  ֱ(_V)"
+
+#: plugins/gestures/gestures.c:252 plugins/gestures/gestures.c:270
+msgid "Mouse Gestures"
+msgstr "콺 "
+
+#: plugins/gestures/gestures.c:255 plugins/gestures/gestures.c:276
+msgid ""
+"Allows support for mouse gestures in conversation windows.\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 ""
+
+#: plugins/win32/transparency/win2ktrans.c:121
+#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:464
+msgid "Opacity:"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:383
+#: plugins/win32/transparency/win2ktrans.c:392
+msgid "Transparency"
+msgstr ""
+
+#: plugins/win32/transparency/win2ktrans.c:385
+#: plugins/win32/transparency/win2ktrans.c:396
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows.\n"
+"\n"
+"* Note: This plugin requires Win2000 or WinXP."
+msgstr ""
+
+#. IM Convo trans options
+#: plugins/win32/transparency/win2ktrans.c:411
+msgid "IM Conversation Windows"
+msgstr "޽ ȭ â"
+
+#: plugins/win32/transparency/win2ktrans.c:412
 #, fuzzy
-msgid "Shows recently logged conversations in new conversations "
-msgstr " ȭ ϳ â  "
-
-#: plugins/iconaway.c:52
-msgid "Iconify on away"
-msgstr ""
-
-#: plugins/iconaway.c:54 plugins/iconaway.c:65
-msgid "Iconifies the away box and the buddy list when you go away."
-msgstr ""
-
-#: plugins/iconaway.c:61
-msgid "Iconify On Away"
-msgstr ""
-
-#: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
-#: src/protocols/msn/msn.c:2438
+msgid "_IM window transparency"
+msgstr "޽ â(_I)"
+
+#: plugins/win32/transparency/win2ktrans.c:422
+#, fuzzy
+msgid "_Show slider bar in IM window"
+msgstr "â  ֱ(l)"
+
+#. Buddy List trans options
+#: plugins/win32/transparency/win2ktrans.c:447 src/prefs.c:545
+msgid "Buddy List Window"
+msgstr "ģâ"
+
+#: plugins/win32/transparency/win2ktrans.c:448
+#, fuzzy
+msgid "_Keep Buddy List window on top"
+msgstr "ģâ"
+
+#: plugins/win32/transparency/win2ktrans.c:451
+#, fuzzy
+msgid "_Buddy List window transparency"
+msgstr "ģâ"
+
+#: plugins/win32/winprefs/winprefs.c:144 plugins/win32/winprefs/winprefs.c:153
+msgid "WinGaim Options"
+msgstr "  ɼ"
+
+#: plugins/win32/winprefs/winprefs.c:146 plugins/win32/winprefs/winprefs.c:157
+msgid "Options specific to Windows Gaim."
+msgstr ""
+
+#. IM Convo trans options
+#: plugins/win32/winprefs/winprefs.c:170
+msgid "Startup"
+msgstr ""
+
+#: plugins/win32/winprefs/winprefs.c:171
+msgid "_Start Gaim on Windows startup"
+msgstr ""
+
+#: src/protocols/gg/gg.c:74 src/protocols/msn/msn.c:1509
+#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo.c:1201
+#: src/protocols/yahoo/yahoo.c:1280
 msgid "Available"
 msgstr "޽   "
 
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:75
 msgid "Available for friends only"
 msgstr "ģ鿡Ը ޽   "
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:77
 msgid "Away for friends only"
 msgstr "ģ鿡Ը ڸ ǥ"
 
-#: src/protocols/gg/gg.c:77
+#: src/protocols/gg/gg.c:78 src/protocols/oscar/oscar.c:2581
+#: src/protocols/oscar/oscar.c:4046 src/protocols/oscar/oscar.c:4074
+#: src/protocols/oscar/oscar.c:5099 src/protocols/yahoo/yahoo.c:1045
+#: src/protocols/yahoo/yahoo.c:1223 src/protocols/yahoo/yahoo.c:1290
 msgid "Invisible"
 msgstr " ʵ "
 
-#: src/protocols/gg/gg.c:78
+#: src/protocols/gg/gg.c:79
 msgid "Invisible for friends only"
 msgstr "ģ鿡Ը  ʵ "
 
-#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1161
+#: src/protocols/gg/gg.c:80 src/protocols/jabber/jabber.c:1169
 msgid "Unavailable"
 msgstr "޽   "
 
-#: src/protocols/gg/gg.c:165
+#: src/protocols/gg/gg.c:166
 msgid "Unable to resolve hostname."
 msgstr "ȣƮ IP   ϴ."
 
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:169
 msgid "Unable to connect to server."
 msgstr "   ϴ."
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:172
 msgid "Invalid response from server."
 msgstr "κ ȿ   Խϴ."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:175
 msgid "Error while reading from socket."
 msgstr "Ͽ д ߿  ߻߽ϴ."
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:178
 msgid "Error while writing to socket."
 msgstr "Ͽ  ߿  ߻߽ϴ."
 
-#: src/protocols/gg/gg.c:180
+#: src/protocols/gg/gg.c:181
 msgid "Authentication failed."
 msgstr " ."
 
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:184
 msgid "Unknown Error Code."
 msgstr "    ڵ."
 
-#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
+#: src/protocols/gg/gg.c:289 src/protocols/msn/msn.c:1651
 #, c-format
 msgid "Status: %s"
 msgstr ": %s"
 
-#: src/protocols/gg/gg.c:309
+#: src/protocols/gg/gg.c:310
 msgid "Could not connect"
 msgstr "  ϴ."
 
-#: src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:317
 msgid "Unable to read socket"
 msgstr "   ϴ."
 
-#: src/protocols/gg/gg.c:429
+#: src/protocols/gg/gg.c:427
 msgid "Unable to connect."
 msgstr "  ϴ."
 
-#: src/protocols/gg/gg.c:442
+#: src/protocols/gg/gg.c:443
 msgid "Reading data"
 msgstr "͸ д "
 
-#: src/protocols/gg/gg.c:445
+#: src/protocols/gg/gg.c:446
 msgid "Balancer handshake"
 msgstr "뷱 Ǽ"
 
-#: src/protocols/gg/gg.c:448
+#: src/protocols/gg/gg.c:449
 msgid "Reading server key"
 msgstr " Ű д "
 
-#: src/protocols/gg/gg.c:451
+#: src/protocols/gg/gg.c:452
 msgid "Exchanging key hash"
 msgstr "Ű ؽ ȯϴ "
 
-#: src/protocols/gg/gg.c:460
+#: src/protocols/gg/gg.c:461
 msgid "Critical error in GG library\n"
 msgstr "GG ̺귯 ġ \n"
 
-#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:580
+#: src/protocols/gg/gg.c:480 src/protocols/gg/gg.c:576
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s  ϴ."
 
-#: src/protocols/gg/gg.c:531
+#: src/protocols/gg/gg.c:529
 msgid "Unable to ping server"
 msgstr "    "
 
-#: src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:541
 msgid "Send as message"
 msgstr "޽ "
 
-#: src/protocols/gg/gg.c:551
+#: src/protocols/gg/gg.c:549
 msgid "Looking up GG server"
 msgstr "GG  ã "
 
-#: src/protocols/gg/gg.c:554
+#: src/protocols/gg/gg.c:552
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "߸ - UIN "
 
-#: src/protocols/gg/gg.c:604
+#: src/protocols/gg/gg.c:600
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "߸ - UIN ޽  ϰֽϴ."
 
-#: src/protocols/gg/gg.c:667
+#: src/protocols/gg/gg.c:663
 msgid "Couldn't get search results"
-msgstr "˻    ϴ"
-
-#: src/protocols/gg/gg.c:672
+msgstr "ã    "
+
+#: src/protocols/gg/gg.c:668
 msgid "Gadu-Gadu Search Engine"
 msgstr "- ˻ "
 
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:693
 msgid "Active"
 msgstr "Ȱȭ"
 
-#: src/protocols/gg/gg.c:698
-msgid "yes"
-msgstr ""
+#: src/protocols/gg/gg.c:694 src/protocols/oscar/oscar.c:4491 src/gtkft.c:986
+msgid "Yes"
+msgstr "Ȯ"
+
+#: src/protocols/gg/gg.c:694 src/protocols/oscar/oscar.c:4491 src/gtkft.c:987
+msgid "No"
+msgstr ""
 
 #: src/protocols/gg/gg.c:698
-msgid "no"
-msgstr "ƴϿ"
+msgid "UIN"
+msgstr "UIN"
 
 #: src/protocols/gg/gg.c:702
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/gg/gg.c:706
 msgid "First name"
 msgstr "̸"
 
-#: src/protocols/gg/gg.c:711
+#: src/protocols/gg/gg.c:707
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:711
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:722 src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:721
 msgid "Birth year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:731 src/protocols/gg/gg.c:733
-#: src/protocols/gg/gg.c:735
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:731
 msgid "Sex"
 msgstr ""
 
 #. Line 5
-#: src/dialogs.c:2122 src/dialogs.c:2825 src/protocols/gg/gg.c:739
+#: src/protocols/gg/gg.c:735 src/dialogs.c:2146 src/dialogs.c:2818
 msgid "City"
 msgstr "/"
 
-#: src/protocols/gg/gg.c:771
-#, fuzzy
+#: src/protocols/gg/gg.c:767
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
-msgstr " ģ  Ǿ  ʽϴ."
-
-#: src/protocols/gg/gg.c:777
+msgstr "Gadu-Gadu  ģ  ϴ."
+
+#: src/protocols/gg/gg.c:773
 msgid "Couldn't Import Buddy List from Server"
 msgstr " ģ    ϴ."
 
-#: src/protocols/gg/gg.c:824
-#, fuzzy
+#: src/protocols/gg/gg.c:826
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
-msgstr " ģ   Խϴ."
-
-#: src/protocols/gg/gg.c:829
-#, fuzzy
+msgstr "Gadu-Gadu  ģ   Խϴ."
+
+#: src/protocols/gg/gg.c:831
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-msgstr " ģ    ϴ."
-
-#: src/protocols/gg/gg.c:835
-#, fuzzy
+msgstr "Gadu-Gadu  ģ    ϴ."
+
+#: src/protocols/gg/gg.c:837
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
-msgstr " ģ  Ǿϴ."
-
-#: src/protocols/gg/gg.c:840
-#, fuzzy
+msgstr "Gadu-Gadu  ģ  ϴ."
+
+#: src/protocols/gg/gg.c:842
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr " ģ    ϴ."
-
-#: src/protocols/gg/gg.c:846
+msgstr "Gadu-Gadu  ģ    ϴ."
+
+#: src/protocols/gg/gg.c:848
 msgid "Password changed successfully"
-msgstr "йȣ  Ǿϴ."
-
-#: src/protocols/gg/gg.c:851
+msgstr "йȣ  ٲپϴ."
+
+#: src/protocols/gg/gg.c:853
 msgid "Password couldn't be changed"
-msgstr "йȣ   ϴ."
-
-#: src/protocols/gg/gg.c:962
+msgstr "йȣ ٲ  ϴ."
+
+#: src/protocols/gg/gg.c:964
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:963
+#: src/protocols/gg/gg.c:965
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:990
+#: src/protocols/gg/gg.c:992
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:991
+#: src/protocols/gg/gg.c:993
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1048
-#, fuzzy
+#: src/protocols/gg/gg.c:1059
 msgid "Couldn't export buddy list"
-msgstr " ģ    ϴ."
-
-#: src/protocols/gg/gg.c:1049 src/protocols/gg/gg.c:1071
+msgstr "ģ    ϴ."
+
+#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1070
+#: src/protocols/gg/gg.c:1081
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1118
-#, fuzzy
+#: src/protocols/gg/gg.c:1129
 msgid "Unable to access directory"
-msgstr " ޽   "
-
-#: src/protocols/gg/gg.c:1119
+msgstr "丮   "
+
+#: src/protocols/gg/gg.c:1130
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1151
-#, fuzzy
+#: src/protocols/gg/gg.c:1162
 msgid "Unable to change Gadu-Gadu password"
-msgstr "йȣ   ϴ."
-
-#: src/protocols/gg/gg.c:1152
+msgstr "Gadu-Gadu йȣ ٲ  "
+
+#: src/protocols/gg/gg.c:1163
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1177
 msgid "Directory Search"
-msgstr "丮 ˻"
-
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:2238 src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
-#: src/protocols/jabber/jabber.c:4148 src/protocols/jabber/jabber.c:4161
+msgstr "丮 ã"
+
+#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4136
+#: src/protocols/oscar/oscar.c:5315 src/protocols/toc/toc.c:1406
+#: src/dialogs.c:2262
 msgid "Change Password"
-msgstr "йȣ "
-
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1183
+msgstr "йȣ ٲٱ"
+
+#: src/protocols/gg/gg.c:1193
 msgid "Import Buddy List from Server"
 msgstr " ģ  "
 
-#: src/protocols/gg/gg.c:1168 src/protocols/gg/gg.c:1184
+#: src/protocols/gg/gg.c:1199
 msgid "Export Buddy List to Server"
 msgstr "ģ   "
 
-#: src/protocols/gg/gg.c:1170 src/protocols/gg/gg.c:1185
+#: src/protocols/gg/gg.c:1205
 msgid "Delete Buddy List from Server"
-msgstr " ģ  "
-
-#: src/protocols/gg/gg.c:1214
-#, fuzzy
+msgstr " ģ  "
+
+#: src/protocols/gg/gg.c:1237
 msgid "Unable to access user profile."
-msgstr "%s    ϴ."
-
-#: src/protocols/gg/gg.c:1215
+msgstr " Ұ   ϴ."
+
+#: src/protocols/gg/gg.c:1238
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+#: src/protocols/gg/gg.c:1315 src/protocols/icq/gaim_icq.c:518
 msgid "Nick:"
 msgstr ":"
 
-#: src/protocols/gg/gg.c:1294
+#: src/protocols/gg/gg.c:1316
 msgid "Gadu-Gadu User"
 msgstr "- ڸ"
 
-#: src/protocols/icq/gaim_icq.c:229
+#: src/protocols/icq/gaim_icq.c:231
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr ""
 
-#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
-#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
-#: src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622 src/dialogs.c:3820
-#: src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208 src/multi.c:1040
-#: src/multi.c:1139 src/multi.c:1457 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
-#: src/protocols/oscar/oscar.c:4621 src/protocols/toc/toc.c:1987
-#: src/prpl.c:280 src/prpl.c:638
+#. Cancel button.
+#: src/protocols/icq/gaim_icq.c:284 src/protocols/irc/irc.c:1342
+#: src/protocols/oscar/oscar.c:2188 src/protocols/oscar/oscar.c:2248
+#: src/protocols/oscar/oscar.c:4948 src/protocols/toc/toc.c:1994
+#: src/buddy_chat.c:303 src/dialogs.c:483 src/dialogs.c:2204
+#: src/dialogs.c:2327 src/dialogs.c:2392 src/dialogs.c:2555 src/dialogs.c:2752
+#: src/dialogs.c:2929 src/dialogs.c:3690 src/dialogs.c:3903 src/dialogs.c:4069
+#: src/dialogs.c:4583 src/dialogs.c:5331 src/gtkft.c:1080 src/multi.c:1362
+#: src/multi.c:1717 src/prpl.c:311 src/prpl.c:674 src/server.c:1030
 msgid "Cancel"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1652
-#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
-#: src/protocols/oscar/oscar.c:2120
+#: src/protocols/icq/gaim_icq.c:304 src/protocols/jabber/jabber.c:1671
+#: src/protocols/msn/msn.c:368 src/protocols/msn/msn.c:517
+#: src/protocols/oscar/oscar.c:2358 src/protocols/oscar/oscar.c:4525
 msgid "Authorize"
 msgstr ""
 
-#: src/dialogs.c:2576 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1652 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1301 src/protocols/oscar/oscar.c:2120
-#: src/protocols/oscar/oscar.c:2174
+#: src/protocols/icq/gaim_icq.c:304 src/protocols/jabber/jabber.c:1671
+#: src/protocols/msn/msn.c:368 src/protocols/msn/msn.c:517
+#: src/protocols/oscar/oscar.c:2358 src/protocols/oscar/oscar.c:4525
+#: src/dialogs.c:2554
 msgid "Deny"
 msgstr "ź"
 
-#: src/protocols/icq/gaim_icq.c:306
+#: src/protocols/icq/gaim_icq.c:317
 msgid "Send message through server"
 msgstr "  ޽ "
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2644
-#: src/protocols/jabber/jabber.c:3241 src/protocols/jabber/jabber.c:3274
-#: src/protocols/oscar/oscar.c:4660 src/protocols/oscar/oscar.c:4712
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/icq/gaim_icq.c:478 src/protocols/irc/irc.c:2754
+#: src/protocols/jabber/jabber.c:3217 src/protocols/jabber/jabber.c:3250
+#: src/protocols/oscar/oscar.c:5110 src/protocols/oscar/oscar.c:5169
+#: src/protocols/toc/toc.c:1267
 msgid "Get Info"
 msgstr " "
 
-#: src/protocols/icq/gaim_icq.c:512
-#, fuzzy
+#: src/protocols/icq/gaim_icq.c:519
 msgid "Gaim User"
-msgstr "   ð ֱ"
+msgstr " "
 
 #: src/protocols/irc/irc.c:199
 msgid ""
@@ -626,397 +806,431 @@
 "the Account Editor)"
 msgstr ""
 
-#: src/protocols/irc/irc.c:543 src/protocols/irc/irc.c:2354
+#: src/protocols/irc/irc.c:499 src/protocols/irc/irc.c:2461
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "%s DCC  ϴ"
 
-#: src/protocols/irc/irc.c:719
-#, fuzzy
+#: src/protocols/irc/irc.c:552 src/protocols/irc/irc.c:2470
+#, fuzzy, c-format
+msgid "DCC Chat with %s established"
+msgstr "%s DCC  ϴ"
+
+#: src/protocols/irc/irc.c:682
 msgid "No topic is set"
-msgstr "Ͽ "
-
-#: src/protocols/irc/irc.c:739 src/protocols/irc/irc.c:1544
+msgstr " "
+
+#: src/protocols/irc/irc.c:703 src/protocols/irc/irc.c:1624
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s   %s  ٲپϴ</B>"
+msgstr "<B>%s  %s() ٲپϴ</B>"
+
+#: src/protocols/irc/irc.c:748
+#, c-format
+msgid "-:- mode/%s [%c%c %s] by %s"
+msgstr ""
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1089
-#, fuzzy
+#: src/protocols/irc/irc.c:1081
 msgid "Rehashing server"
 msgstr " Ű д "
 
-#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1439
-#, fuzzy
+#: src/protocols/irc/irc.c:1081 src/protocols/irc/irc.c:1517
 msgid "IRC Operator"
-msgstr "IRC "
+msgstr "IRC ۷"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1092
+#: src/protocols/irc/irc.c:1084
 msgid "No such nick/channel"
 msgstr "׷ ȭ̳ ä ϴ."
 
-#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1095
-#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
-#: src/protocols/irc/irc.c:1397
+#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1092
+#: src/protocols/irc/irc.c:1475
 msgid "IRC Error"
 msgstr "IRC "
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1087
 msgid "No such server"
 msgstr "׷  ϴ"
 
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1097
+#: src/protocols/irc/irc.c:1089
 msgid "No nickname given"
 msgstr "ȭ Է ʾҽϴ"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1092
 msgid "You're not an IRC operator!"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1103
+#: src/protocols/irc/irc.c:1095
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1250 src/protocols/irc/irc.c:1256
-#: src/protocols/irc/irc.c:1262 src/protocols/irc/irc.c:1276
+#: src/protocols/irc/irc.c:1305 src/protocols/irc/irc.c:1311
+#: src/protocols/irc/irc.c:1317 src/protocols/irc/irc.c:1331
 msgid "IRC CTCP info"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1287
+#: src/protocols/irc/irc.c:1341
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1288
+#: src/protocols/irc/irc.c:1342
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1288 src/protocols/oscar/oscar.c:2020
-#: src/protocols/oscar/oscar.c:4621
-#, fuzzy
+#: src/protocols/irc/irc.c:1342 src/protocols/oscar/oscar.c:2188
+#: src/protocols/oscar/oscar.c:4948
 msgid "Connect"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1333 src/protocols/msn/msn.c:307
-#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
-#: src/protocols/msn/msn.c:1811
+msgstr ""
+
+#: src/protocols/irc/irc.c:1414 src/protocols/msn/msn.c:154
+#: src/protocols/msn/msn.c:526 src/protocols/msn/msn.c:1023
 msgid "Unable to write"
 msgstr "  ϴ."
 
-#: src/protocols/irc/irc.c:1395
+#: src/protocols/irc/irc.c:1473
 #, c-format
 msgid "You have been kicked from %s: %s"
-msgstr "%sκ  Ǿϴ: %s"
-
-#: src/protocols/irc/irc.c:1400
+msgstr "%sԿ  Ǿϴ: %s"
+
+#: src/protocols/irc/irc.c:1478
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "%s  Ǿϴ: %s"
 
-#: src/protocols/irc/irc.c:1456 src/protocols/irc/irc.c:2663
+#: src/protocols/irc/irc.c:1534 src/protocols/irc/irc.c:2773
 msgid "CTCP ClientInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:2669
-#, fuzzy
+#: src/protocols/irc/irc.c:1540 src/protocols/irc/irc.c:2779
 msgid "CTCP UserInfo"
-msgstr "  "
-
-#: src/protocols/irc/irc.c:1468 src/protocols/irc/irc.c:2675
+msgstr ""
+
+#: src/protocols/irc/irc.c:1546 src/protocols/irc/irc.c:2785
 msgid "CTCP Version"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1495 src/protocols/irc/irc.c:2681
+#: src/protocols/irc/irc.c:1573 src/protocols/irc/irc.c:2791
 msgid "CTCP Ping"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1972
+#: src/protocols/irc/irc.c:2066
 #, c-format
 msgid "Topic for %s is %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2064
+#: src/protocols/irc/irc.c:2163
 #, c-format
 msgid "You have left %s"
-msgstr "%s ܵξϴ."
-
-#: src/protocols/irc/irc.c:2065
+msgstr "%s() ܵξϴ."
+
+#: src/protocols/irc/irc.c:2164
 msgid "IRC Part"
 msgstr "IRC "
 
-#: src/protocols/irc/irc.c:2232
+#: src/protocols/irc/irc.c:2219
+msgid "<I>Requesting DCC CHAT</I>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2236
+msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2241
+msgid ""
+"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
+"<nick><BR>PING <nick></B><BR>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2249
+msgid "<B>DCC commands:<BR>CHAT <nick></B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2254
+msgid ""
+"<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
+"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
+"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
+"CTCP commands<BR>Type /HELP DCC for DCC commands"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2277
+msgid "<B>Unknown command</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:2337
 msgid "Channel:"
 msgstr "ä:"
 
-#: src/aim.c:325 src/multi.c:641 src/protocols/irc/irc.c:2236
+#: src/protocols/irc/irc.c:2341 src/main.c:347 src/multi.c:683
 msgid "Password:"
-msgstr "н:"
-
-#: src/protocols/irc/irc.c:2650
+msgstr "йȣ:"
+
+#: src/protocols/irc/irc.c:2760
 msgid "DCC Chat"
 msgstr "DCC ä"
 
-#: src/protocols/irc/irc.c:2721 src/protocols/jabber/jabber.c:2860
-#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:2831 src/protocols/jabber/jabber.c:2833
+#: src/protocols/msn/msn.c:2027 src/protocols/napster/napster.c:612
 msgid "Server:"
 msgstr ":"
 
-#: src/protocols/irc/irc.c:2727 src/protocols/jabber/jabber.c:4224
-#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
-#, fuzzy
+#: src/protocols/irc/irc.c:2837 src/protocols/jabber/jabber.c:4194
+#: src/protocols/msn/msn.c:2033 src/protocols/napster/napster.c:618
+#: src/multi.c:980
 msgid "Port:"
-msgstr "Ʈ"
-
-#: src/protocols/irc/irc.c:2733
+msgstr "Ʈ:"
+
+#: src/protocols/irc/irc.c:2843
 msgid "Encoding:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:972
-#, fuzzy
+#: src/protocols/jabber/jabber.c:980
 msgid "Unable to change password."
-msgstr "йȣ   ϴ."
-
-#: src/protocols/jabber/jabber.c:973
+msgstr "йȣ ٲ  ϴ."
+
+#: src/protocols/jabber/jabber.c:981
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:978
-#, fuzzy
+#: src/protocols/jabber/jabber.c:986
 msgid "Unable to change password"
-msgstr "йȣ   ϴ."
-
-#: src/protocols/jabber/jabber.c:979
+msgstr "йȣ ٲ  ϴ."
+
+#: src/protocols/jabber/jabber.c:987
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1147 src/dialogs.c:1728 src/list.c:696
 msgid "Unknown"
 msgstr "˷ "
 
-#: src/buddy.c:2795 src/multi.c:245 src/protocols/jabber/jabber.c:1167
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1175 src/protocols/jabber/jabber.c:1193
+#: src/protocols/oscar/oscar.c:2583 src/protocols/oscar/oscar.c:4057
+#: src/protocols/oscar/oscar.c:5093 src/protocols/yahoo/yahoo.c:1047
+#: src/buddy.c:2656 src/multi.c:263
 msgid "Online"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1177
 msgid "Extended Away"
 msgstr "ڸ"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1179 src/protocols/oscar/oscar.c:2571
+#: src/protocols/oscar/oscar.c:4062 src/protocols/oscar/oscar.c:5095
 msgid "Do Not Disturb"
 msgstr "ر"
 
-#: src/protocols/jabber/jabber.c:1368
-#, fuzzy, c-format
+#: src/protocols/jabber/jabber.c:1377
+#, c-format
 msgid "Jabber Error %s"
-msgstr " "
-
-#: src/protocols/jabber/jabber.c:1474
+msgstr " : %s"
+
+#: src/protocols/jabber/jabber.c:1486
 #, c-format
 msgid "Error %s: %s"
-msgstr " %s: %s"
-
-#: src/protocols/jabber/jabber.c:1477
+msgstr " %s: %s"
+
+#: src/protocols/jabber/jabber.c:1489
 msgid "Unknown Error in presence"
 msgstr "    ߻"
 
-#: src/protocols/jabber/jabber.c:1647
+#: src/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
-msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
-
-#: src/protocols/jabber/jabber.c:1672
+msgstr "%s  ڽ ģ Ͽ Ϸ մϴ."
+
+#: src/protocols/jabber/jabber.c:1691
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1675
-#, fuzzy
+#: src/protocols/jabber/jabber.c:1694
 msgid "No such user."
-msgstr "׷  "
-
-#: src/dialogs.c:925 src/protocols/jabber/jabber.c:1757
-#: src/protocols/msn/msn.c:1336
+msgstr "׷ ڰ ϴ."
+
+#: src/protocols/jabber/jabber.c:1777 src/protocols/msn/msn.c:542
+#: src/dialogs.c:945
 msgid "Buddies"
 msgstr "ģ"
 
-#: src/protocols/jabber/jabber.c:1817
+#: src/protocols/jabber/jabber.c:1837
 msgid "Authenticating"
 msgstr " Ȯ "
 
-#: src/protocols/jabber/jabber.c:1854
+#: src/protocols/jabber/jabber.c:1871
 msgid "Unknown login error"
 msgstr "   α "
 
-#: src/protocols/jabber/jabber.c:2242
+#: src/protocols/jabber/jabber.c:2213
 msgid "Password successfully changed."
-msgstr "йȣ  Ǿϴ."
-
-#: src/protocols/jabber/jabber.c:2286 src/protocols/jabber/jabber.c:4076
+msgstr "йȣ  ٲپϴ."
+
+#: src/protocols/jabber/jabber.c:2257 src/protocols/jabber/jabber.c:4052
 msgid "Connection lost"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2288 src/protocols/jabber/jabber.c:2320
-#: src/protocols/jabber/jabber.c:4078 src/protocols/jabber/jabber.c:4124
-#: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
+#: src/protocols/jabber/jabber.c:2259 src/protocols/jabber/jabber.c:2291
+#: src/protocols/jabber/jabber.c:4054 src/protocols/jabber/jabber.c:4100
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1202
 msgid "Unable to connect"
 msgstr "  ϴ"
 
-#: src/protocols/jabber/jabber.c:2294
+#: src/protocols/jabber/jabber.c:2265
 msgid "Connected"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2297
+#: src/protocols/jabber/jabber.c:2268
 msgid "Requesting Authentication Method"
 msgstr "  ûϴ "
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2315 src/protocols/msn/msn.c:1982
+#: src/protocols/jabber/jabber.c:2286 src/protocols/msn/msn.c:1193
 msgid "Connecting"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2619
+#: src/protocols/jabber/jabber.c:2592
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2621
+#: src/protocols/jabber/jabber.c:2594
 msgid "Jabber Error"
 msgstr " "
 
-#: src/protocols/jabber/jabber.c:2856
+#: src/protocols/jabber/jabber.c:2829
 msgid "Room:"
 msgstr "ȭ:"
 
-#: src/protocols/jabber/jabber.c:2865
+#: src/protocols/jabber/jabber.c:2838
 msgid "Handle:"
 msgstr "ó:"
 
-#: src/protocols/jabber/jabber.c:2889
-#, fuzzy
+#: src/protocols/jabber/jabber.c:2862
 msgid "Unable to join chat"
-msgstr "  ϴ"
-
-#: src/protocols/jabber/jabber.c:2922
+msgstr "ȭ   "
+
+#: src/protocols/jabber/jabber.c:2895 src/prefs.c:1710
 msgid "Chats"
 msgstr "ä"
 
-#: src/protocols/jabber/jabber.c:3229
+#: src/protocols/jabber/jabber.c:3205
 msgid "View Error Msg"
 msgstr " ޽ "
 
-#: src/buddy_chat.c:889 src/protocols/jabber/jabber.c:3246
-#: src/protocols/oscar/oscar.c:4673
+#: src/protocols/jabber/jabber.c:3222 src/protocols/oscar/oscar.c:5128
+#: src/gtkconv.c:771
 msgid "Get Away Msg"
 msgstr "ڸ ޽ "
 
-#: src/protocols/jabber/jabber.c:3253
+#: src/protocols/jabber/jabber.c:3229
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3256
+#: src/protocols/jabber/jabber.c:3232
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3255
 msgid "Remove From Roster"
 msgstr "Ͽ "
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3260
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "˾â  "
 
-#: src/protocols/jabber/jabber.c:3477
+#: src/protocols/jabber/jabber.c:3453
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3478
+#: src/protocols/jabber/jabber.c:3454
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3455
 msgid "Given Name"
 msgstr "̸"
 
-#: src/protocols/jabber/jabber.c:3480
+#: src/protocols/jabber/jabber.c:3456
 msgid "Nickname"
-msgstr ""
-
-#: src/dialogs.c:3016 src/protocols/jabber/jabber.c:3481
+msgstr "г"
+
+#: src/protocols/jabber/jabber.c:3457 src/dialogs.c:3058
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3482
+#: src/protocols/jabber/jabber.c:3458
 msgid "Street Address"
 msgstr "Ÿ ּ"
 
-#: src/protocols/jabber/jabber.c:3483
+#: src/protocols/jabber/jabber.c:3459
 msgid "Extended Address"
 msgstr " ּ"
 
-#: src/protocols/jabber/jabber.c:3484
+#: src/protocols/jabber/jabber.c:3460
 msgid "Locality"
 msgstr "ġ"
 
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:3461
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3486
+#: src/protocols/jabber/jabber.c:3462
 msgid "Postal Code"
 msgstr "ȣ"
 
 #. Line 7
-#: src/dialogs.c:2144 src/dialogs.c:2847 src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3463 src/dialogs.c:2168 src/dialogs.c:2840
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3488
+#: src/protocols/jabber/jabber.c:3464
 msgid "Telephone"
 msgstr "ȭ"
 
-#: src/dialogs.c:2921 src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3465 src/dialogs.c:2914
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3466
 msgid "Organization Name"
 msgstr " ̸"
 
-#: src/protocols/jabber/jabber.c:3491
+#: src/protocols/jabber/jabber.c:3467
 msgid "Organization Unit"
 msgstr " μ"
 
-#: src/protocols/jabber/jabber.c:3492
+#: src/protocols/jabber/jabber.c:3468
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3493
+#: src/protocols/jabber/jabber.c:3469
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3494
+#: src/protocols/jabber/jabber.c:3470
 msgid "Birthday"
 msgstr ""
 
-#: src/dialogs.c:3024 src/prefs.c:985 src/protocols/jabber/jabber.c:3495
+#: src/protocols/jabber/jabber.c:3471 src/dialogs.c:3068 src/prefs.c:391
+#: src/prefs.c:1298
 msgid "Description"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3520
+#: src/protocols/jabber/jabber.c:3496
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -1024,586 +1238,544 @@
 "  ׸ ûԴϴ. Էص ϴٰ ϴ  Է"
 "ʽÿ."
 
-#: src/protocols/jabber/jabber.c:3521
+#: src/protocols/jabber/jabber.c:3497
 msgid "User Identity"
 msgstr " Ȯ"
 
-#: src/protocols/jabber/jabber.c:3933
+#: src/protocols/jabber/jabber.c:3909
 msgid "Gaim - Edit Jabber vCard"
-msgstr " -  vCard "
-
-#: src/protocols/jabber/jabber.c:4006
+msgstr "Gaim - Jabber vCard ġ"
+
+#: src/protocols/jabber/jabber.c:3982
 msgid "Server Registration successful!"
 msgstr "  ߽ϴ!"
 
-#: src/protocols/jabber/jabber.c:4033
+#: src/protocols/jabber/jabber.c:4009
 msgid "Unknown registration error"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:4142 src/protocols/jabber/jabber.c:4157
+#: src/protocols/jabber/jabber.c:4122 src/protocols/oscar/oscar.c:5308
+#: src/protocols/toc/toc.c:1394
 msgid "Set User Info"
 msgstr "  Է"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/jabber/jabber.c:4200
+msgid "Connect Server:"
+msgstr " :"
+
+#: src/protocols/msn/msn.c:69
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "  (   )"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:72
 msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "߸ Ķ (   )"
-
-#: src/protocols/msn/msn.c:228
+msgstr "߸ Ķ (   )"
+
+#: src/protocols/msn/msn.c:75
 msgid "Invalid User"
 msgstr "߸ "
 
-#: src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:78
 msgid "Fully Qualified Domain Name missing"
 msgstr " ̸ "
 
-#: src/protocols/msn/msn.c:234
+#: src/protocols/msn/msn.c:81
 msgid "Already Login"
 msgstr "̹ αεǾ "
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:84
 msgid "Invalid Username"
 msgstr "߸  ̸"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:87
 msgid "Invalid Friendly Name"
 msgstr "߸ ȭ"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:90
 msgid "List Full"
 msgstr " "
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:93
 msgid "Already there"
 msgstr "̹ "
 
-#: src/protocols/msn/msn.c:249
+#: src/protocols/msn/msn.c:96
 msgid "Not on list"
 msgstr "Ͽ "
 
-#: src/protocols/msn/msn.c:252
+#: src/protocols/msn/msn.c:99
 msgid "User is offline"
 msgstr "ڰ  ƴ"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:102
 msgid "Already in the mode"
 msgstr "̹ ش 忡 "
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:105
 msgid "Already in opposite list"
 msgstr "̹ ݴ Ͽ "
 
-#: src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:108
 msgid "Switchboard failed"
 msgstr "ġ "
 
-#: src/protocols/msn/msn.c:264
+#: src/protocols/msn/msn.c:111
 msgid "Notify Transfer failed"
 msgstr " ˸ "
 
-#: src/protocols/msn/msn.c:268
+#: src/protocols/msn/msn.c:115
 msgid "Required fields missing"
 msgstr "ʼ ׸ "
 
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
+#: src/protocols/msn/msn.c:118 src/protocols/oscar/oscar.c:621
 msgid "Not logged in"
 msgstr "ӵ "
 
-#: src/protocols/msn/msn.c:275
+#: src/protocols/msn/msn.c:122
 msgid "Internal server error"
 msgstr "  "
 
-#: src/protocols/msn/msn.c:278
+#: src/protocols/msn/msn.c:125
 msgid "Database server error"
 msgstr "ͺ̽  "
 
-#: src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:128
 msgid "File operation error"
 msgstr " ó "
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:131
 msgid "Memory allocation error"
 msgstr "޸ Ҵ "
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:135
 msgid "Server busy"
 msgstr " ٻ"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:138
 msgid "Server unavailable"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:294
+#: src/protocols/msn/msn.c:141
 msgid "Peer Notification server down"
 msgstr "Ǿ ˸  ٿ"
 
-#: src/protocols/msn/msn.c:297
+#: src/protocols/msn/msn.c:144
 msgid "Database connect error"
 msgstr "ͺ̽  "
 
-#: src/protocols/msn/msn.c:300
+#: src/protocols/msn/msn.c:147
 msgid "Server is going down (abandon ship)"
 msgstr "  ٿ"
 
-#: src/protocols/msn/msn.c:304
+#: src/protocols/msn/msn.c:151
 msgid "Error creating connection"
 msgstr "  ߻"
 
-#: src/protocols/msn/msn.c:310
+#: src/protocols/msn/msn.c:157
 msgid "Session overload"
 msgstr " ϰ ʹ ŭ"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:160
 msgid "User is too active"
 msgstr "ڰ ʹ Ȱ"
 
-#: src/protocols/msn/msn.c:316
+#: src/protocols/msn/msn.c:163
 msgid "Too many sessions"
 msgstr " ʹ ϴ."
 
-#: src/protocols/msn/msn.c:319
+#: src/protocols/msn/msn.c:166
 msgid "Not expected"
 msgstr "ġ "
 
-#: src/protocols/msn/msn.c:322
+#: src/protocols/msn/msn.c:169
 msgid "Bad friend file"
 msgstr "߸ ģ "
 
-#: src/protocols/msn/msn.c:326
+#: src/protocols/msn/msn.c:173
 msgid "Authentication failed"
 msgstr " ."
 
-#: src/protocols/msn/msn.c:329
+#: src/protocols/msn/msn.c:176
 msgid "Not allowed when offline"
 msgstr "   "
 
-#: src/protocols/msn/msn.c:332
+#: src/protocols/msn/msn.c:179
 msgid "Not accepting new users"
 msgstr "ο ڸ  "
 
-#: src/protocols/msn/msn.c:335
+#: src/protocols/msn/msn.c:182
 msgid "User unverified"
 msgstr "ڸ   "
 
-#: src/protocols/msn/msn.c:338
+#: src/protocols/msn/msn.c:185
 msgid "Unknown Error Code"
 msgstr "    ڵ."
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:294 src/protocols/msn/msn.c:316
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1561
+#: src/protocols/msn/msn.c:1577 src/protocols/msn/msn.c:1686
+#: src/protocols/msn/msn.c:1699 src/protocols/msn/msn.c:1725
+#: src/protocols/msn/msn.c:1772 src/protocols/msn/msn.c:1790
+#: src/protocols/msn/msn.c:1824 src/protocols/msn/msn.c:1855
+#: src/protocols/msn/msn.c:1891 src/protocols/msn/msn.c:1898
+#: src/protocols/msn/msn.c:1911 src/protocols/msn/msn.c:1919
+#: src/protocols/msn/msn.c:1945 src/protocols/msn/msn.c:1954
+#: src/protocols/msn/msn.c:1967 src/protocols/msn/msn.c:1975
+msgid "Write error"
+msgstr " "
+
+#: src/protocols/msn/msn.c:365
 #, c-format
-msgid "%s has closed the conversation window"
-msgstr ""
-
-#: src/protocols/msn/msn.c:562
-#, fuzzy
-msgid "An MSN message may not have been received."
-msgstr "޽   ϴ."
-
-#: src/protocols/msn/msn.c:1041
-#, fuzzy
-msgid "Gaim was unable to send an MSN message"
-msgstr "޽   ϴ"
-
-#: src/protocols/msn/msn.c:1042
-msgid ""
-"Gaim encountered an error communicating with the MSN switchboard server.  "
-"Please try again later."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
-#: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
-#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
-#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
-#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
-#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
-#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
-#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
-#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
-#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
-#, fuzzy
-msgid "Write error"
-msgstr "AOL "
-
-#: src/protocols/msn/msn.c:1143
-#, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
-
-#: src/protocols/msn/msn.c:1193 src/protocols/msn/msn.c:1968
+msgstr "%s(%s) %s ģ Ͽ Ϸ մϴ."
+
+#: src/protocols/msn/msn.c:415 src/protocols/msn/msn.c:1179
 msgid "Unable to write to server"
-msgstr " ͸   ϴ."
-
-#: src/protocols/msn/msn.c:1300
-#, fuzzy, c-format
+msgstr " ͸   "
+
+#: src/protocols/msn/msn.c:516
 msgid "The user %s (%s) wants to add you to their buddy list"
-msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
-
-# msgid "The user %s (%s) wants to add %s to his or her buddy list."
-# msgstr "%s  ڽ Ͽ ߰ϰ ;մϴ."
-# msgid "The user %s (%s) wants to add you to their buddy list"
-# msgstr "%s  ڽ Ͽ ߰ϰ ;մϴ."
-#: src/protocols/msn/msn.c:1401
+msgstr "%s  ģ Ͽ Ϸ "
+
+#: src/protocols/msn/msn.c:599
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "ٸ   ̵ αϿ  ϴ."
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+#: src/protocols/msn/msn.c:751 src/protocols/msn/msn.c:1064
 msgid "Got invalid XFR\n"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1576
+#: src/protocols/msn/msn.c:788
 msgid "Error transferring"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1899
+msgstr " "
+
+#: src/protocols/msn/msn.c:872 src/protocols/msn/msn.c:1110
 msgid "Error reading from server"
 msgstr " д   ߻߽ϴ."
 
-#: src/protocols/msn/msn.c:1744
-#, fuzzy
+#: src/protocols/msn/msn.c:956
 msgid "Unable to connect to Notification Server"
-msgstr "   ϴ."
-
-#: src/protocols/msn/msn.c:1751
-#, fuzzy
+msgstr "Notification    "
+
+#: src/protocols/msn/msn.c:963
 msgid "Unable to talk to Notification Server"
-msgstr " ͸   ϴ."
-
-#: src/protocols/msn/msn.c:1767
-#, fuzzy
+msgstr "Notification  ޽   "
+
+#: src/protocols/msn/msn.c:979
 msgid "Protocol not supported"
-msgstr " ʴ Դϴ."
-
-#: src/protocols/msn/msn.c:1774
-#, fuzzy
+msgstr " ʴ "
+
+#: src/protocols/msn/msn.c:986
 msgid "Unable to request INF\n"
-msgstr " ޽   "
-
-#: src/protocols/msn/msn.c:1781
-#, fuzzy
+msgstr "INF û Ұ\n"
+
+#: src/protocols/msn/msn.c:993
 msgid "Unable to login using MD5"
-msgstr "AIM  α  ϴ"
-
-#: src/protocols/msn/msn.c:1788
-#, fuzzy
+msgstr "MD5 ؼ   "
+
+#: src/protocols/msn/msn.c:1000
 msgid "Unable to send USR\n"
-msgstr "йȣ   ϴ."
-
-#: src/protocols/msn/msn.c:1793
+msgstr "USR   \n"
+
+#: src/protocols/msn/msn.c:1005
 msgid "Requesting to send password"
-msgstr "йȣ  Դϴ."
-
-#: src/protocols/msn/msn.c:1839
+msgstr "йȣ  "
+
+#: src/protocols/msn/msn.c:1051
 msgid "Unable to send password"
-msgstr "йȣ   ϴ."
-
-#: src/protocols/msn/msn.c:1844
+msgstr "йȣ   "
+
+#: src/protocols/msn/msn.c:1056
 msgid "Password sent"
 msgstr "йȣ "
 
-#: src/protocols/msn/msn.c:1873
-#, fuzzy
+#: src/protocols/msn/msn.c:1084
 msgid "Unable to transfer"
-msgstr "  ϴ."
-
-#: src/protocols/msn/msn.c:1881
-#, fuzzy
+msgstr "  "
+
+#: src/protocols/msn/msn.c:1092
 msgid "Unable to parse message"
-msgstr "޽   ϴ : ʹ Ůϴ."
-
-#: src/protocols/msn/msn.c:1974
+msgstr "޽ м  "
+
+#: src/protocols/msn/msn.c:1185
 msgid "Synching with server"
 msgstr " ȭ"
 
-#: src/protocols/msn/msn.c:2334 src/protocols/msn/msn.c:2361
+#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1537
+#: src/protocols/msn/msn.c:1604
 msgid "Away From Computer"
 msgstr "ڸ"
 
-#: src/protocols/msn/msn.c:2335 src/protocols/msn/msn.c:2363
+#: src/protocols/msn/msn.c:1511 src/protocols/msn/msn.c:1539
+#: src/protocols/msn/msn.c:1602 src/protocols/yahoo/yahoo.c:1027
+#: src/protocols/yahoo/yahoo.c:1205 src/protocols/yahoo/yahoo.c:1281
 msgid "Be Right Back"
 msgstr " ƿ"
 
-#: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
-#: src/protocols/msn/msn.c:2426
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1541
+#: src/protocols/msn/msn.c:1600 src/protocols/yahoo/yahoo.c:1029
+#: src/protocols/yahoo/yahoo.c:1207 src/protocols/yahoo/yahoo.c:1282
 msgid "Busy"
 msgstr "ٸ 빫 "
 
-#: src/protocols/msn/msn.c:2337 src/protocols/msn/msn.c:2367
+#: src/protocols/msn/msn.c:1513 src/protocols/msn/msn.c:1543
+#: src/protocols/msn/msn.c:1606 src/protocols/yahoo/yahoo.c:1037
+#: src/protocols/yahoo/yahoo.c:1215 src/protocols/yahoo/yahoo.c:1286
 msgid "On The Phone"
 msgstr "ȭ "
 
-#: src/protocols/msn/msn.c:2338 src/protocols/msn/msn.c:2369
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1545
+#: src/protocols/msn/msn.c:1608 src/protocols/yahoo/yahoo.c:1041
+#: src/protocols/yahoo/yahoo.c:1219 src/protocols/yahoo/yahoo.c:1288
 msgid "Out To Lunch"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2339 src/protocols/msn/msn.c:2371
+#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1547
 msgid "Hidden"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2428
-#, fuzzy
-msgid "Be right back"
-msgstr " ƿ"
-
-#: src/protocols/msn/msn.c:2430
-#, fuzzy
-msgid "Away from the computer"
-msgstr "ڸ"
-
-#: src/protocols/msn/msn.c:2432
-#, fuzzy
-msgid "On the phone"
-msgstr "ȭ "
-
-#: src/protocols/msn/msn.c:2434
-#, fuzzy
-msgid "Out to lunch"
-msgstr " "
-
-#: src/prefs.c:748 src/protocols/msn/msn.c:2436
-#, fuzzy
+#: src/protocols/msn/msn.c:1610 src/prefs.c:1059
 msgid "Idle"
-msgstr ":"
-
-#: src/protocols/msn/msn.c:2473
-msgid "Reset friendly name"
-msgstr "ȭ  ħ"
-
-#: src/buddy.c:2192 src/protocols/msn/msn.c:2479
-#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4686
+msgstr ""
+
+#: src/protocols/msn/msn.c:1641 src/protocols/oscar/oscar.c:2825
+#: src/protocols/oscar/oscar.c:5142 src/buddy.c:1998
 msgid "Send File"
 msgstr " "
 
-#: src/protocols/msn/msn.c:2555
-#, fuzzy
+#: src/protocols/msn/msn.c:1718
 msgid "New MSN friendly name too long."
-msgstr "ȭ ʹ ϴ."
-
-#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
+msgstr "ο MSN ȭ ʹ ϴ."
+
+#: src/protocols/msn/msn.c:1733
+msgid "Set Friendly Name:"
+msgstr "ȭ Է: "
+
+#: src/protocols/msn/msn.c:1742
 msgid "Set Friendly Name"
-msgstr " ȭ "
-
-#: src/protocols/msn/msn.c:2571
-msgid "Set Friendly Name:"
-msgstr "ȭ: "
-
-#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
-msgid "Reset All Friendly Names"
-msgstr "ȭ   ħ"
-
-#: src/protocols/msn/msn.c:2732
+msgstr "ȭ Է"
+
+#: src/protocols/msn/msn.c:1878
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your allow list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
-#, fuzzy
+#: src/protocols/msn/msn.c:1881 src/protocols/msn/msn.c:1935
 msgid "Invalid MSN screenname"
-msgstr "߸  ̸"
-
-#: src/protocols/msn/msn.c:2789
+msgstr "߸ MSN ̵"
+
+#: src/protocols/msn/msn.c:1932
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
 "meant %s@hotmail.com.  No changes were made to your block list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4185
-#: src/protocols/toc/toc.c:1144
+#: src/protocols/msn/switchboard.c:104
+#, c-format
+msgid "%s has closed the conversation window"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:181
+msgid "An MSN message may not have been received."
+msgstr "MSN ޽   ϴ."
+
+#: src/protocols/msn/switchboard.c:411
+msgid "Gaim was unable to send an MSN message"
+msgstr "MSN ޽   "
+
+#: src/protocols/msn/switchboard.c:412
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/napster/napster.c:461 src/protocols/oscar/oscar.c:4593
+#: src/protocols/toc/toc.c:1150
 msgid "Join what group:"
 msgstr " ׷:"
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:373 src/protocols/oscar/oscar.c:388
+#: src/protocols/oscar/oscar.c:392
+msgid "File Transfer Aborted"
+msgstr "  "
+
+#: src/protocols/oscar/oscar.c:373
 #, fuzzy
+msgid "Unable to establish listener socket."
+msgstr "   ϴ."
+
+#: src/protocols/oscar/oscar.c:388
+#, fuzzy
+msgid "Unable to establish file descriptor."
+msgstr "%s    ϴ."
+
+#: src/protocols/oscar/oscar.c:392
+#, fuzzy
+msgid "Unable to create new connection."
+msgstr "  ϴ."
+
+#: src/protocols/oscar/oscar.c:617
 msgid "Invalid error"
-msgstr "߸ "
-
-#: src/protocols/oscar/oscar.c:395
-#, fuzzy
+msgstr "߸ "
+
+#: src/protocols/oscar/oscar.c:618
 msgid "Invalid SNAC"
-msgstr "߸ ̸"
-
-#: src/protocols/oscar/oscar.c:396
+msgstr "߸ SNAC"
+
+#: src/protocols/oscar/oscar.c:619
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:620
 msgid "Rate to client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:399
-#, fuzzy
+#: src/protocols/oscar/oscar.c:622
 msgid "Service unavailable"
-msgstr "   "
-
-#: src/protocols/oscar/oscar.c:400
+msgstr " Ұ"
+
+#: src/protocols/oscar/oscar.c:623
 msgid "Service not defined"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:624
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:625
 msgid "Not supported by host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:626
 msgid "Not supported by client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:627
 msgid "Refused by client"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:628
 msgid "Reply too big"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:629
 msgid "Responses lost"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:630
 msgid "Request denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:631
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:632
 msgid "Insufficient rights"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:633
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:634
 msgid "Too evil (sender)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:412
+#: src/protocols/oscar/oscar.c:635
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:413
+#: src/protocols/oscar/oscar.c:636
 #, fuzzy
 msgid "User temporarily unavailable"
 msgstr "丮 񽺸 Ͻ   ϴ."
 
-#: src/protocols/oscar/oscar.c:414
+#: src/protocols/oscar/oscar.c:637
 msgid "No match"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:415
+#: src/protocols/oscar/oscar.c:638
 msgid "List overflow"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:416
+#: src/protocols/oscar/oscar.c:639
 msgid "Request ambiguous"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:417
+#: src/protocols/oscar/oscar.c:640
 msgid "Queue full"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:418
+#: src/protocols/oscar/oscar.c:641
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:662
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s   ϴ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:664
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%s  ῡ ߽ϴ"
 
-#: src/protocols/oscar/oscar.c:502
-msgid "connection error (rend)\n"
-msgstr "  (ɰ)\n"
-
-#: src/protocols/oscar/oscar.c:513
-msgid "major connection error\n"
-msgstr "  (߿)\n"
-
-#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
-#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
+#: src/protocols/oscar/oscar.c:714 src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:578 src/protocols/toc/toc.c:641
 msgid "Disconnected."
 msgstr "."
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
+#: src/protocols/oscar/oscar.c:726 src/protocols/toc/toc.c:813
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ȭǰ  ϴ."
 
-#: src/protocols/oscar/oscar.c:539
+#: src/protocols/oscar/oscar.c:739
 msgid "Chat is currently unavailable"
 msgstr " ä  ϴ."
 
-#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1886
-msgid "Buddy canceled transfer"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:673
+#: src/protocols/oscar/oscar.c:802 src/protocols/oscar/oscar.c:859
 msgid "Couldn't connect to host"
 msgstr "ȣƮ   ϴ."
 
-#: src/protocols/oscar/oscar.c:619
-msgid "Password sent, waiting for response\n"
-msgstr "н带   ٸ \n"
-
-#: src/protocols/oscar/oscar.c:654
-msgid "internal connection error\n"
-msgstr "  \n"
-
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:842
 msgid "Unable to login to AIM"
-msgstr "AIM  α  ϴ"
-
-#: src/protocols/oscar/oscar.c:660
+msgstr "AIM α  ϴ"
+
+#: src/protocols/oscar/oscar.c:847
 #, c-format
 msgid "Signon: %s"
 msgstr ": %s"
 
-#: src/protocols/oscar/oscar.c:742
-msgid "Signed off.\n"
-msgstr " .\n"
-
-#: src/protocols/oscar/oscar.c:761 src/protocols/oscar/oscar.c:909
+#: src/protocols/oscar/oscar.c:949 src/protocols/oscar/oscar.c:1128
 msgid "Could Not Connect"
 msgstr "  ϴ"
 
-#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:956
 msgid "Connection established, cookie sent"
 msgstr "  Ű ½ϴ"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:810 src/protocols/toc/toc.c:503
+#: src/protocols/oscar/oscar.c:1027 src/protocols/toc/toc.c:514
 msgid "Incorrect nickname or password."
 msgstr "̵ н尡 ƲȽϴ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:815
+#: src/protocols/oscar/oscar.c:1031
 msgid "Your account is currently suspended."
 msgstr "    Դϴ."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:819
-#, fuzzy
+#: src/protocols/oscar/oscar.c:1035
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr " 񽺰  Ұմϴ."
+msgstr "AOL ޽ 񽺰    ϴ."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:823
+#: src/protocols/oscar/oscar.c:1039
 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."
@@ -1612,109 +1784,136 @@
 "õѴٸ ٷ ϴ ð  ϴ."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:828
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:1043
+#, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "ϰ ִ Ŭ̾Ʈ ʹ Ǿϴ.  ġ ׷̵Ͻ"
-"ÿ. "
-
-#: src/protocols/oscar/oscar.c:833 src/protocols/toc/toc.c:586
+"ÿ. %s"
+
+#: src/protocols/oscar/oscar.c:1047 src/protocols/toc/toc.c:596
 msgid "Authentication Failed"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:855
+#: src/protocols/oscar/oscar.c:1069
 msgid "Internal Error"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:975
-#: src/protocols/oscar/oscar.c:1059
+#: src/protocols/oscar/oscar.c:1167 src/protocols/oscar/oscar.c:1196
+#: src/protocols/oscar/oscar.c:1278
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:950 src/protocols/oscar/oscar.c:977
+#: src/protocols/oscar/oscar.c:1169 src/protocols/oscar/oscar.c:1198
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "޽   ϴ"
 
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1280
 #, fuzzy
-msgid "Gaim was Unable to get valid login hash."
+msgid "Gaim was Unable to get a valid login hash."
 msgstr "޽   ϴ"
 
-#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:1709 src/protocols/oscar/oscar.c:4806
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s  "
 
-#: src/protocols/oscar/oscar.c:1609
-#, fuzzy
-msgid "Transfer timed out"
-msgstr " ˸ "
-
-#: src/protocols/oscar/oscar.c:1631
-#, fuzzy
-msgid "Couldn't open listener to send file"
-msgstr "  %s   ϴ."
-
-#: src/protocols/oscar/oscar.c:1632
-#, fuzzy
-msgid "File transfer aborted"
-msgstr " ˸ "
-
-#: src/protocols/oscar/oscar.c:1831 src/protocols/oscar/oscar.c:1851
+#: src/protocols/oscar/oscar.c:2023 src/protocols/oscar/oscar.c:2043
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2020
+#: src/protocols/oscar/oscar.c:2188
 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/oscar/oscar.c:2116
+#: src/protocols/oscar/oscar.c:2211
+#, fuzzy
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "%s  ڽ ģ Ͽ Ϸ մϴ."
+
+#: src/protocols/oscar/oscar.c:2219
+#, fuzzy
+msgid "Authorization Request Message:"
+msgstr " û"
+
+#: src/protocols/oscar/oscar.c:2219
+msgid "Please authorize me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2244
+#, c-format
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2248
+#, fuzzy
+msgid "Request Authorization"
+msgstr "  ûϴ "
+
+#: src/protocols/oscar/oscar.c:2282 src/protocols/oscar/oscar.c:2284
+#: src/protocols/oscar/oscar.c:2290 src/protocols/oscar/oscar.c:2353
+#: src/protocols/oscar/oscar.c:2365 src/protocols/oscar/oscar.c:2730
+#: src/protocols/oscar/oscar.c:2781 src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4561
+msgid "No reason given."
+msgstr " Է ʾҽϴ."
+
+#: src/protocols/oscar/oscar.c:2290
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr " û"
+
+#: src/protocols/oscar/oscar.c:2353
 #, fuzzy, c-format
 msgid ""
-"The user %lu wants to add you to their buddy list for the following reason: %"
-"s"
-msgstr "%s  ڽ ģ Ͽ ߰ϰ ;մϴ."
-
-#: src/protocols/oscar/oscar.c:2116 src/protocols/oscar/oscar.c:2127
-msgid "No reason given."
-msgstr " Է ʾҽϴ."
-
-#: src/protocols/oscar/oscar.c:2120
-#, fuzzy
+"The user %lu wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr "%s  ڽ ģ Ͽ Ϸ մϴ."
+
+#: src/protocols/oscar/oscar.c:2358 src/protocols/oscar/oscar.c:4525
 msgid "Authorization Request"
-msgstr " - ICQ  źε"
-
-#: src/protocols/oscar/oscar.c:2127
+msgstr " û"
+
+#: src/protocols/oscar/oscar.c:2365
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
 "the following reason:\n"
 "%s"
 msgstr ""
-"%lu  ģ Ͽ ڽ ߰ϴ     ߽"
+"%lu  ģ Ͽ ڽ ϴ     ߽"
 ": \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2128
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2366
 msgid "ICQ authorization denied."
-msgstr " - ICQ  źε"
+msgstr "ICQ  źεǾϴ."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2134
+#: src/protocols/oscar/oscar.c:2372
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
-msgstr "%lu  ģ Ͽ ڽ ߰ϴ  ޾Ƶ鿴ϴ."
-
-#: src/protocols/oscar/oscar.c:2141
+msgstr "%lu  ģ Ͽ ڽ ϴ  ޾Ƶ鿴ϴ."
+
+#: src/protocols/oscar/oscar.c:2379
+#, fuzzy, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr "%sκ  Ǿϴ: %s"
+
+#: src/protocols/oscar/oscar.c:2387
 #, fuzzy, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1723,211 +1922,201 @@
 "%s"
 msgstr "%sκ  Ǿϴ: %s"
 
-#: src/protocols/oscar/oscar.c:2149
-#, c-format
+#: src/protocols/oscar/oscar.c:2395
+#, fuzzy, c-format
 msgid ""
-"You have received an ICQ email\n"
+"You have received an ICQ email from %s [%s]\n"
 "\n"
-"1=%s\n"
-"2=%s\n"
-"3=%s\n"
-"4=%s\n"
-"5=%s\n"
-"6=%s\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2170
+"Message is:\n"
+"%s"
+msgstr "%sκ  Ǿϴ: %s"
+
+#: src/protocols/oscar/oscar.c:2416
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2174
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2420
 msgid "Do you want to add this contact to your Buddy List?"
-msgstr ""
-"\n"
-"\n"
-" ģ Ͽ ߰ұ?"
-
-#: src/protocols/oscar/oscar.c:2254
+msgstr " ģ Ͽ ұ?"
+
+#: src/protocols/oscar/oscar.c:2420
+#, fuzzy
+msgid "Decline"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2500
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because it was invalid."
-msgstr "%d %s  ޽ ȿ ʾ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2255
-#, fuzzy, c-format
-msgid "You missed %hu messages from %s because they were invalid."
-msgstr "%d %s  ޽ ȿ ʾ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2264
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] "%d %s  ޽ ȿ ʾ   ϴ."
+msgstr[1] "%d %s  ޽ ȿ ʾ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2511
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because it was too large."
-msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2265
-#, fuzzy, c-format
-msgid "You missed %hu messages from %s because they were too large."
-msgstr "%d %s  ޽ ʹ Ŀ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2274
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] "%d %s  ޽ ʹ Ŀ   ϴ."
+msgstr[1] "%d %s  ޽ ʹ Ŀ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2522
 #, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
-msgstr "%d %s  ޽ ð  ʰ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2275
-#, fuzzy, c-format
-msgid ""
+msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr "%d %s  ޽ ð  ʰ   ϴ."
-
-#: src/protocols/oscar/oscar.c:2284
+msgstr[0] "%d %s  ޽ ð  ʰ   ϴ."
+msgstr[1] "%d %s  ޽ ð  ʰ   ϴ."
+
+#: src/protocols/oscar/oscar.c:2533
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
-msgstr ""
+msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] ""
 "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#: src/protocols/oscar/oscar.c:2285
-#, fuzzy, c-format
-msgid "You missed %hu messages from %s because he/she was too evil."
-msgstr ""
+msgstr[1] ""
 "%d %s  ޽  ܾ ϰ ־   ϴ."
 
-#: src/protocols/oscar/oscar.c:2294
+#: src/protocols/oscar/oscar.c:2544
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because you are too evil."
-msgstr " ܾ ؼ %d %s  ޽   ϴ."
-
-#: src/protocols/oscar/oscar.c:2295
-#, fuzzy, c-format
-msgid "You missed %hu messages from %s because you are too evil."
-msgstr " ܾ ؼ %d %s  ޽   ϴ."
-
-#: src/protocols/oscar/oscar.c:2303
+msgid_plural "You missed %hu messages from %s because you are too evil."
+msgstr[0] ""
+" ܾ ؼ %d %s  ޽   ϴ."
+msgstr[1] ""
+" ܾ ؼ %d %s  ޽   ϴ."
+
+#: src/protocols/oscar/oscar.c:2554
 #, fuzzy, c-format
 msgid "You missed %hu message from %s for an unknown reason."
-msgstr "    %d %s  ޽   ϴ."
-
-#: src/protocols/oscar/oscar.c:2304
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "    %d %s  ޽   ϴ."
+msgstr[1] "    %d %s  ޽   ϴ."
+
+#: src/protocols/oscar/oscar.c:2569 src/protocols/oscar/oscar.c:4071
+#: src/protocols/oscar/oscar.c:5098
+msgid "Free For Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2573 src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:5096
+#, fuzzy
+msgid "Not Available"
+msgstr "޽   "
+
+#: src/protocols/oscar/oscar.c:2575 src/protocols/oscar/oscar.c:4068
+#: src/protocols/oscar/oscar.c:5097
+msgid "Occupied"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2579
+msgid "Web Aware"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2636
 #, fuzzy, c-format
-msgid "You missed %hu messages from %s for an unknown reason."
-msgstr "    %d %s  ޽   ϴ."
-
-#: src/protocols/oscar/oscar.c:2342
-#, c-format
-msgid "%s has declined to receive a file from %s.\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2387
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
+
+#: src/protocols/oscar/oscar.c:2638
 #, fuzzy, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
-msgstr "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR>%s<BR>"
-
-#: src/protocols/oscar/oscar.c:2389
-#, fuzzy, c-format
-msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
+msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>:</B> %s<BR><HR><BR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2694
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC : %s\n"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2695
 #, fuzzy
 msgid "Unknown error"
 msgstr "   α "
 
-#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:2529
-#, fuzzy
-msgid "No reason was given."
-msgstr " Է ʾҽϴ."
-
-#. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2476
+#. Data is assumed to be the destination sn
+#: src/protocols/oscar/oscar.c:2729
 #, fuzzy, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "%sԿ ޽  ߽ϴ: %s"
 
-#: src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2780
 #, fuzzy, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s   ޾ƿ  ϴ: %s"
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:2558
+#: src/protocols/oscar/oscar.c:2810 src/buddy.c:1983
 msgid "Buddy Icon"
 msgstr "ģ "
 
-#: src/buddy.c:2180 src/protocols/oscar/oscar.c:2561
+#: src/protocols/oscar/oscar.c:2813 src/buddy.c:1986
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:2183 src/protocols/oscar/oscar.c:2564
+#: src/protocols/oscar/oscar.c:2816 src/buddy.c:1989
 msgid "IM Image"
 msgstr "׸ ޽"
 
-#: src/buddy.c:500 src/buddy.c:2186 src/buddy.c:2531
-#: src/protocols/oscar/oscar.c:2567
+#: src/protocols/oscar/oscar.c:2819 src/buddy.c:402 src/buddy.c:1992
+#: src/buddy.c:2373
 msgid "Chat"
 msgstr "ä"
 
-#: src/buddy.c:2189 src/protocols/oscar/oscar.c:2570
+#: src/protocols/oscar/oscar.c:2822 src/buddy.c:1995
 msgid "Get File"
 msgstr " ޱ"
 
-#: src/buddy.c:2196 src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2829 src/buddy.c:2002
 msgid "Games"
 msgstr ""
 
-#: src/buddy.c:2199 src/protocols/oscar/oscar.c:2580
+#: src/protocols/oscar/oscar.c:2832 src/buddy.c:2005
 msgid "Stocks"
 msgstr ""
 
-#: src/buddy.c:2202 src/protocols/oscar/oscar.c:2583
+#: src/protocols/oscar/oscar.c:2835 src/buddy.c:2008
 msgid "Send Buddy List"
 msgstr "ģ  "
 
-#: src/buddy.c:2205 src/protocols/oscar/oscar.c:2586
+#: src/protocols/oscar/oscar.c:2838 src/buddy.c:2011
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy "
 
-#: src/buddy.c:2208 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:2841 src/buddy.c:2014
 msgid "AP User"
 msgstr "AP "
 
-#: src/buddy.c:2211 src/protocols/oscar/oscar.c:2592
+#: src/protocols/oscar/oscar.c:2844 src/buddy.c:2017
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:2214 src/protocols/oscar/oscar.c:2595
+#: src/protocols/oscar/oscar.c:2847 src/buddy.c:2020
 msgid "Nihilist"
 msgstr "㹫"
 
-#: src/buddy.c:2217 src/protocols/oscar/oscar.c:2598
+#: src/protocols/oscar/oscar.c:2850 src/buddy.c:2023
 msgid "ICQ Server Relay"
 msgstr "ICQ  "
 
-#: src/buddy.c:2220 src/protocols/oscar/oscar.c:2601
+#: src/protocols/oscar/oscar.c:2853 src/buddy.c:2026
 msgid "ICQ Unknown"
 msgstr "ICQ ˷ "
 
-#: src/buddy.c:2223 src/protocols/oscar/oscar.c:2604
+#: src/protocols/oscar/oscar.c:2856 src/buddy.c:2029
 msgid "Trillian Encryption"
 msgstr "Ʈ ȣȭ"
 
-#: src/protocols/oscar/oscar.c:2655
+#: src/protocols/oscar/oscar.c:2907
 msgid ""
 "<I>Unable to display information because it was sent in an unknown encoding."
 "</I>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2677
+#: src/protocols/oscar/oscar.c:2930
 #, fuzzy, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "Warning Level : <B>%d %%</B><BR>\n"
-"%s%s%s<BR>\n"
+"%s%s%s\n"
 "<HR>\n"
 msgstr ""
 "ڸ : <B>%s</B>  %s <BR>\n"
@@ -1935,28 +2124,28 @@
 "%s%s%s<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:2709
+#: src/protocols/oscar/oscar.c:2962
 msgid "<i>User has no away message</i>"
 msgstr "<i>ڸ ޽ </i>"
 
-#: src/protocols/oscar/oscar.c:2720
+#: src/protocols/oscar/oscar.c:2973
 msgid "Client Capabilities: "
 msgstr "Ŭ̾Ʈ ȣȯ: "
 
-#: src/protocols/oscar/oscar.c:2727
+#: src/protocols/oscar/oscar.c:2980
 msgid "<i>No Information Provided</i>"
 msgstr "<i> </i>"
 
-#: src/protocols/oscar/oscar.c:2751
+#: src/protocols/oscar/oscar.c:3001
 #, fuzzy
 msgid "Your AIM connection may be lost."
 msgstr " ϴ."
 
-#: src/protocols/oscar/oscar.c:3010
+#: src/protocols/oscar/oscar.c:3255
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3011
+#: src/protocols/oscar/oscar.c:3256
 #, fuzzy
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
@@ -1965,275 +2154,388 @@
 "ʹ  ޽   ʰϿ  ޽   "
 ". 10  ٽ õϽʽÿ."
 
-#: src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:3697
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3490
+#: src/protocols/oscar/oscar.c:3724
 #, fuzzy
 msgid "Error Changing Account Info"
 msgstr "  ߻"
 
-#: src/protocols/oscar/oscar.c:3493
+#: src/protocols/oscar/oscar.c:3727
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3496
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3499
+#: src/protocols/oscar/oscar.c:3733
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3502
+#: src/protocols/oscar/oscar.c:3736
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3505
+#: src/protocols/oscar/oscar.c:3739
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3508
+#: src/protocols/oscar/oscar.c:3742
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3511
+#: src/protocols/oscar/oscar.c:3745
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3521
+#: src/protocols/oscar/oscar.c:3755
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3522 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3756 src/protocols/oscar/oscar.c:3762
 #, fuzzy
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3761
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3720
+#: src/protocols/oscar/oscar.c:3955
 #, fuzzy
 msgid "Unable to set AIM profile."
 msgstr "%s    ϴ."
 
-#: src/protocols/oscar/oscar.c:3721
+#: src/protocols/oscar/oscar.c:3956
 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 ""
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3962
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3764
+#: src/protocols/oscar/oscar.c:3999
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "޽   ϴ"
 
-#: src/protocols/oscar/oscar.c:3765
+#: src/protocols/oscar/oscar.c:4000
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3781
+#: src/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
 "it and set you away."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
-"ģ Ͽ ִ %d ģ ߰  ,  ģ Ͽ %d "
+"ģ Ͽ ִ %d ģ   ,  ģ Ͽ %d "
 "ϴ. ѵ ں ģ     ģ ¶  "
 "  ֽϴ."
 
-#: src/protocols/oscar/oscar.c:4189 src/protocols/toc/toc.c:1148
+#: src/protocols/oscar/oscar.c:4486
+#, fuzzy, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr "%s  ڽ ģ Ͽ Ϸ մϴ."
+
+#: src/protocols/oscar/oscar.c:4491
+#, fuzzy
+msgid "Authorization Given"
+msgstr " û"
+
+#: src/protocols/oscar/oscar.c:4520
+#, fuzzy, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr "%s  ڽ ģ Ͽ Ϸ մϴ."
+
+#. Granted
+#: src/protocols/oscar/oscar.c:4557
+#, fuzzy, c-format
+msgid "The user %s has granted your request to add them to your contact list."
+msgstr "%lu  ģ Ͽ ڽ ϴ  ޾Ƶ鿴ϴ."
+
+#: src/protocols/oscar/oscar.c:4558
+#, fuzzy
+msgid "Authorization Granted"
+msgstr " - ICQ  ޾Ƶ鿩"
+
+#. Denied
+#: src/protocols/oscar/oscar.c:4561
+#, fuzzy, c-format
+msgid ""
+"The user %s has denied your request to add them to your contact list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"%lu  ģ Ͽ ڽ ϴ     ߽"
+": \n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4562
+#, fuzzy
+msgid "Authorization Denied"
+msgstr "ICQ  źεǾϴ."
+
+#: src/protocols/oscar/oscar.c:4597 src/protocols/toc/toc.c:1154
 msgid "Exchange:"
 msgstr "ȯ:"
 
-#: src/protocols/oscar/oscar.c:4610
+#: src/protocols/oscar/oscar.c:4935
 msgid "Unable to open Direct IM"
 msgstr " ޽   "
 
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4947
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4621
+#: src/protocols/oscar/oscar.c:4948
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4635
+#: src/protocols/oscar/oscar.c:4962
 #, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>Remote client does not support "
 "sending status messages.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ϴ α׷ "
 " ޽    ʽϴ.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:4969
 #, fuzzy, c-format
 msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
-"I><BR>"
+"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>User has no status message.</I><BR>"
 msgstr ""
 "<B>UIN:</B> %s<BR><B>:</B> %s<BR><HR><BR><I> ޽ ϴ.</"
 "I><BR>"
 
-#: src/protocols/oscar/oscar.c:4667
+#: src/protocols/oscar/oscar.c:5118
 msgid "Get Status Msg"
 msgstr " ޽ "
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:5136
 msgid "Direct IM"
 msgstr " "
 
-#: src/protocols/oscar/oscar.c:4694
+#: src/protocols/oscar/oscar.c:5152
 msgid "Get Capabilities"
 msgstr "   "
 
-#: src/protocols/toc/toc.c:442
+#: src/protocols/oscar/oscar.c:5179
+#, fuzzy
+msgid "Re-request Authorization"
+msgstr "  ûϴ "
+
+#: src/protocols/oscar/oscar.c:5200
+msgid "The new formatting is invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5201
+msgid "Screenname formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5207
+msgid "New screenname formatting:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5252
+msgid "Change Address To: "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5262
+msgid "You are awaiting authorization from the following buddies:<BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5283
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5288
+#, c-format
+msgid ""
+"%s<BR><BR>You can re-request authorization from these buddies by right-"
+"clicking on them in the \"Edit Buddies\" pane and selecting \"Re-request "
+"authorization.\""
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5323
+msgid "Change Password (URL)"
+msgstr "йȣ ٲٱ (URL)"
+
+#: src/protocols/oscar/oscar.c:5334
+#, fuzzy
+msgid "Format Screenname"
+msgstr "̵"
+
+#: src/protocols/oscar/oscar.c:5340
+#, fuzzy
+msgid "Confirm Account"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5346
+msgid "Display Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5352
+msgid "Change Current Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5361
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5369
+msgid "Search for Buddy by Email"
+msgstr "̸Ϸ ģ ã"
+
+#: src/protocols/toc/toc.c:453
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s Ͽ   ϴ."
 
-#: src/protocols/toc/toc.c:445
+#: src/protocols/toc/toc.c:456
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s    ϴ."
 
-#: src/protocols/toc/toc.c:448
+#: src/protocols/toc/toc.c:459
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "޽ ʹ   %s Ʈ ©Ƚϴ."
 
-#: src/protocols/toc/toc.c:451
+#: src/protocols/toc/toc.c:462
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s  α ʾҽϴ."
 
-#: src/protocols/toc/toc.c:454
+#: src/protocols/toc/toc.c:465
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s   ʽϴ."
 
-#: src/protocols/toc/toc.c:457
+#: src/protocols/toc/toc.c:468
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr " ӵѰ踦 Ѿ  ޽   ϴ."
 
-#: src/protocols/toc/toc.c:460
+#: src/protocols/toc/toc.c:471
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s ä    ϴ."
 
-#: src/protocols/toc/toc.c:463
+#: src/protocols/toc/toc.c:474
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%sԿ ʹ  ޽  ֽϴ."
 
-#: src/protocols/toc/toc.c:466
+#: src/protocols/toc/toc.c:477
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%sԿԼ  ޽ ʹ Ŀ   ϴ."
 
-#: src/protocols/toc/toc.c:469
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s ޽ ʹ     ϴ."
 
-#: src/protocols/toc/toc.c:472
+#: src/protocols/toc/toc.c:483
 msgid "Failure."
 msgstr "."
 
-#: src/protocols/toc/toc.c:475
+#: src/protocols/toc/toc.c:486
 msgid "Too many matches."
 msgstr "ش ׸ ʹ ϴ."
 
-#: src/protocols/toc/toc.c:478
+#: src/protocols/toc/toc.c:489
 msgid "Need more qualifiers."
 msgstr "  Ͻʽÿ."
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:492
 msgid "Dir service temporarily unavailable."
 msgstr "丮 񽺸 Ͻ   ϴ."
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:495
 msgid "Email lookup restricted."
 msgstr " ãƺⰡ Ǿ ֽϴ."
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:498
 msgid "Keyword ignored."
 msgstr "Ű尡 õǾϴ."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:501
 msgid "No keywords."
 msgstr "Ű尡 ϴ."
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:504
 msgid "User has no directory information."
 msgstr "ڰ 丮    ʽϴ."
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:508
 msgid "Country not supported."
 msgstr " ʴ Դϴ."
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "   : %s."
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:517
 msgid "The service is temporarily unavailable."
 msgstr " 񽺰  Ұմϴ."
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:520
 msgid "Your warning level is currently too high to log in."
 msgstr "αϱ⿡   ʹ ϴ."
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:523
 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."
@@ -2241,38 +2543,38 @@
 "ʹ   Ḧ ݺϿϴ. 10 ٸ  ٽ õϽʽÿ. "
 " õѴٸ ٷ ϴ ð  ϴ."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:525
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr " ߿     ߻Ͽϴ: %s."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "   , %d ߻Ͽϴ.  : %s"
-
-#: src/protocols/toc/toc.c:535
+msgstr "   , %d() ߻Ͽϴ.  : %s"
+
+#: src/protocols/toc/toc.c:545
 msgid "Connection Closed"
 msgstr " ϴ."
 
-#: src/protocols/toc/toc.c:573
+#: src/protocols/toc/toc.c:583
 msgid "Waiting for reply..."
 msgstr " ٸ ..."
 
-#: src/protocols/toc/toc.c:642
+#: src/protocols/toc/toc.c:647
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC Ͻ ¿ ٽ ۵Ǿϴ.  ޽   ֽϴ."
 
-#: src/protocols/toc/toc.c:826
+#: src/protocols/toc/toc.c:832
 msgid "Password Change Successful"
-msgstr "йȣ Ǿϴ."
-
-#: src/protocols/toc/toc.c:829
+msgstr "йȣ  ٲپ"
+
+#: src/protocols/toc/toc.c:835
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:829
+#: src/protocols/toc/toc.c:835
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -2283,109 +2585,136 @@
 "մϴ. ׸  ޽     ֽϴ. ̰"
 " Ͻ ̴ Ű澲 ʽÿ."
 
-#: src/protocols/toc/toc.c:1265
+#: src/protocols/toc/toc.c:1273
 msgid "Get Dir Info"
 msgstr "丮  "
 
-#: src/protocols/toc/toc.c:1445
-#, fuzzy
+#: src/protocols/toc/toc.c:1400
+msgid "Set Dir Info"
+msgstr "丮  "
+
+#: src/protocols/toc/toc.c:1454
 msgid "TOC Host:"
-msgstr "ȣƮ"
-
-#: src/protocols/toc/toc.c:1451
-#, fuzzy
+msgstr "TOC ȣƮ:"
+
+#: src/protocols/toc/toc.c:1460
 msgid "TOC Port:"
-msgstr "Ʈ"
-
-#: src/protocols/toc/toc.c:1578
-#, fuzzy, c-format
+msgstr "TOC Ʈ:"
+
+#: src/protocols/toc/toc.c:1587
 msgid "Could not open %s for writing!"
-msgstr "    ϴ!"
-
-#: src/protocols/toc/toc.c:1656 src/protocols/toc/toc.c:1698
-#: src/protocols/toc/toc.c:1903
-#, fuzzy
+msgstr "%s()     ϴ!"
+
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1704
+#: src/protocols/toc/toc.c:1906
 msgid "Could not connect for transfer."
-msgstr "    ϴ!"
-
-#: src/protocols/toc/toc.c:1817
+msgstr "    ϴ."
+
+#: src/protocols/toc/toc.c:1823
 msgid "Could not connect for transfer!"
 msgstr "    ϴ!"
 
-#: src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1853
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-
-#: src/protocols/toc/toc.c:1947
+msgstr "    ϴ.   Ϸ ʾ Դϴ."
+
+#: src/protocols/toc/toc.c:1951 src/gtkft.c:1026
 msgid "Gaim - Save As..."
-msgstr " -  ̸ "
-
-#: src/protocols/toc/toc.c:1979
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr ""
-"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
-
-#: src/protocols/toc/toc.c:1980
-#, c-format
-msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr ""
-"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+msgstr "Gaim -  ̸ "
 
 #: src/protocols/toc/toc.c:1985
+#, fuzzy, 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 %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+msgstr[1] ""
+"%s %s %d  ϱ⸦ ûϿϴ :%s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1992
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s  ޶ ûϿϴ"
 
-#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+#: src/protocols/toc/toc.c:1994 src/gtkft.c:1079 src/prpl.c:307
+#: src/server.c:1030
 msgid "Accept"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:583
+#: src/protocols/yahoo/yahoo.c:582
 #, fuzzy
 msgid "Your Yahoo! message did not get sent."
 msgstr "޽ ޵ ʾҽϴ."
 
-#: src/protocols/yahoo/yahoo.c:1361
+#: src/protocols/yahoo/yahoo.c:1031 src/protocols/yahoo/yahoo.c:1209
+#: src/protocols/yahoo/yahoo.c:1283
+msgid "Not At Home"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1033 src/protocols/yahoo/yahoo.c:1211
+#: src/protocols/yahoo/yahoo.c:1284
+msgid "Not At Desk"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1035 src/protocols/yahoo/yahoo.c:1213
+#: src/protocols/yahoo/yahoo.c:1285
+#, fuzzy
+msgid "Not In Office"
+msgstr "˸"
+
+#: src/protocols/yahoo/yahoo.c:1039 src/protocols/yahoo/yahoo.c:1217
+#: src/protocols/yahoo/yahoo.c:1287
+msgid "On Vacation"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1043 src/protocols/yahoo/yahoo.c:1221
+#: src/protocols/yahoo/yahoo.c:1289
+msgid "Stepped Out"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1141
+#, fuzzy
+msgid "Activate ID"
+msgstr "Ȱȭ"
+
+#: src/protocols/yahoo/yahoo.c:1362
 msgid "Pager Host:"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1367
+#: src/protocols/yahoo/yahoo.c:1368
 msgid "Pager Port:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:836
+#: src/protocols/zephyr/zephyr.c:840
 msgid "ZLocate"
 msgstr "Zġ"
 
-#: src/protocols/zephyr/zephyr.c:876
+#: src/protocols/zephyr/zephyr.c:880
 msgid "Class:"
 msgstr "Ŭ:"
 
-#: src/protocols/zephyr/zephyr.c:880
+#: src/protocols/zephyr/zephyr.c:884
 msgid "Instance:"
 msgstr "νϽ:"
 
-#: src/protocols/zephyr/zephyr.c:884
+#: src/protocols/zephyr/zephyr.c:888
 msgid "Recipient:"
 msgstr "޴»:"
 
 #: src/about.c:75
 #, c-format
 msgid "About Gaim v%s"
-msgstr "(v%s)..."
+msgstr "(v%s)"
 
 #: src/about.c:112
-#, fuzzy
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-" AOL  ϴ ޽Դϴ. Gtk+ ̿Ͽ \n"
-"GPL ̼ մϴ.\n"
-"\n"
-"URL:"
+" AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, Gadu-Gadu  "
+"ϴ   ޽Դϴ.  Gtk+ ̿Ͽ  GPL ̼"
+" ϴ.<BR><BR>"
 
 #: src/about.c:122
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -2393,7 +2722,7 @@
 
 #: src/about.c:126
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
-msgstr ""
+msgstr "<FONT SIZE=\"3\">Ȱ  :</FONT><BR>"
 
 #: src/about.c:128
 msgid ""
@@ -2421,445 +2750,356 @@
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 msgstr ""
 
-#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
-#: src/server.c:1159
+#: src/about.c:174 src/dialogs.c:4349 src/prpl.c:522 src/prpl.c:776
+#: src/server.c:1218
 msgid "Close"
 msgstr "ݱ"
 
-#: src/aim.c:165
-#, fuzzy
-msgid "Please enter your login."
-msgstr "  Էϼ"
-
-#: src/aim.c:284
-msgid "Gaim - Login"
-msgstr " - α"
-
-#: src/aim.c:307
-#, fuzzy
-msgid "Screen Name:"
-msgstr "̵: "
-
-#: src/away.c:188
+#: src/away.c:222
 msgid "Gaim - Away!"
-msgstr " - ڸ!"
-
-#: src/away.c:235
+msgstr "Gaim - ڸ!"
+
+#: src/away.c:282
 msgid "I'm Back!"
 msgstr " ƿԴ!"
 
-#: src/away.c:353
+#: src/away.c:386
 msgid "New Away Message"
 msgstr " ڸ ޽"
 
-#: src/away.c:373
+#: src/away.c:406
 msgid "Remove Away Message"
 msgstr "ڸ ޽ "
 
-#: src/away.c:561
+#: src/away.c:595
 msgid "Set All Away"
 msgstr " ڸ ޽ "
 
-#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
+#: src/browser.c:413 src/browser.c:439
+msgid ""
+"Communication with the browser failed.  Please close all windows and try "
+"again."
+msgstr ""
+
+#: src/browser.c:567
+msgid ""
+"Unable to launch your browser because the 'Manual' browser command has been "
+"chosen, but no command has been set."
+msgstr ""
+
+#: src/browser.c:579
+#, c-format
+msgid "There was an error launching your chosen browser: %s"
+msgstr ""
+
+#: src/buddy.c:397 src/buddy.c:2622 src/dialogs.c:1150
 msgid "Group"
 msgstr "׷"
 
-#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
-#: src/buddy_chat.c:863
+#: src/buddy.c:403 src/buddy.c:558 src/buddy.c:722 src/buddy.c:2371
+#: src/gtkconv.c:743
 msgid "IM"
 msgstr "޽"
 
-#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1589
-#: src/conversation.c:2915
+#. Info button
+#: src/buddy.c:404 src/buddy.c:2372 src/gtkconv.c:762 src/gtkconv.c:2543
 msgid "Info"
 msgstr ""
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
-#: src/dialogs.c:3819
+#: src/buddy.c:563 src/buddy.c:727 src/dialogs.c:1140 src/dialogs.c:3889
+#: src/dialogs.c:3902
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:654 src/buddy.c:836
+#: src/buddy.c:568 src/buddy.c:746
 msgid "Add Buddy Pounce"
-msgstr "ģ˸ ߰"
-
-#: src/buddy.c:661 src/buddy.c:842
+msgstr "ģ˸ ϱ"
+
+#: src/buddy.c:575 src/buddy.c:752
 msgid "View Log"
 msgstr " ȭ "
 
-#: src/buddy.c:799 src/buddy.c:830
+#: src/buddy.c:709 src/buddy.c:740
 msgid "Rename"
 msgstr "̸ ٲٱ"
 
-#: src/buddy.c:824
+#: src/buddy.c:734
 msgid "Un-Alias"
 msgstr " "
 
-#: src/buddy.c:1683
+#: src/buddy.c:1397
+#, c-format
+msgid "%s has started typing to you"
+msgstr ""
+
+#: src/buddy.c:1398
+msgid "%s has signed on"
+msgstr "%s "
+
+#: src/buddy.c:1399
+msgid "%s has returned from being idle"
+msgstr "%s Կ ƿ"
+
+#: src/buddy.c:1400
+msgid "%s has returned from being away"
+msgstr "%s ڸ򿡼 ƿ"
+
+#: src/buddy.c:1497
 msgid "New Buddy Pounce"
 msgstr " ģ˸"
 
-#: src/buddy.c:1701
+#: src/buddy.c:1515
 msgid "Remove Buddy Pounce"
 msgstr "ģ˸ "
 
-#: src/buddy.c:1730
-#, fuzzy
+#: src/buddy.c:1544
 msgid "[no message]"
-msgstr "(1 ޽)"
-
-#: src/buddy.c:1732
+msgstr "[޽ ]"
+
+#: src/buddy.c:1546
 msgid "[Click to edit]"
 msgstr "[Ϸ Ŭϼ]"
 
-#: src/buddy.c:2299
+#: src/buddy.c:2110
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "ӵ: %s\n"
 
-#: src/buddy.c:2311
+#: src/buddy.c:2122
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr ": %d%%\n"
 
-#: src/buddy.c:2323
+#: src/buddy.c:2134
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "밡: %s\n"
 
-#: src/buddy.c:2327
-#, c-format
+#: src/buddy.c:2139
+msgid "Alias: %s\n"
+msgstr ": %s\n"
+
+#: src/buddy.c:2144
+msgid "Nickname: %s\n"
+msgstr "г: %s\n"
+
+#: src/buddy.c:2149
+#, fuzzy, c-format
 msgid ""
-"Alias: %s               \n"
-"Screen Name: %s\n"
+"%s%sScreen Name: %s\n"
 "%s%s%s%s%s%s"
 msgstr ""
-": %s               \n"
 "̵: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2331
+#: src/buddy.c:2151
 msgid "Idle: "
 msgstr ":"
 
-#: src/buddy.c:2400 src/buddy.c:2405
+#: src/buddy.c:2220 src/buddy.c:2227
 #, c-format
 msgid "%s logged in."
 msgstr "%s ߽ϴ."
 
-#: src/buddy.c:2459 src/buddy.c:2464
+#: src/buddy.c:2282 src/buddy.c:2290
 #, c-format
 msgid "%s logged out."
 msgstr "%s  ϴ."
 
-#: src/buddy.c:2562
+#: src/buddy.c:2404
 msgid "Information on selected Buddy"
-msgstr " ģ  "
-
-#: src/buddy.c:2563
+msgstr "õ ģ "
+
+#: src/buddy.c:2405
 msgid "Send Instant Message"
 msgstr "޽ "
 
-#: src/buddy.c:2564
+#: src/buddy.c:2406
 msgid "Start/join a Buddy Chat"
 msgstr "ä /"
 
-#: src/buddy.c:2565
+#: src/buddy.c:2407
 msgid "Activate Away Message"
-msgstr "ڸ ޽ "
-
-#: src/buddy.c:2615
+msgstr "ڸ ޽ Ȱ"
+
+#: src/buddy.c:2473
 msgid "Gaim - Buddy List"
-msgstr " - ģ"
-
-#. The file menu
-#: src/buddy.c:2628 src/conversation.c:2039
+msgstr "Gaim - ģ"
+
+#: src/buddy.c:2486
 msgid "File"
 msgstr ""
 
-#: src/buddy.c:2632
-#, fuzzy
+#: src/buddy.c:2490
 msgid "_Add A Buddy"
-msgstr "ģ ߰"
-
-#: src/buddy.c:2634
-#, fuzzy
+msgstr "ģ ϱ(_A)"
+
+#: src/buddy.c:2492
 msgid "_Join A Chat"
-msgstr "ä "
-
-#: src/buddy.c:2636
-#, fuzzy
+msgstr "ä (_J)"
+
+#: src/buddy.c:2494
 msgid "_New Message"
-msgstr " ڸ ޽"
-
-#: src/buddy.c:2638
-#, fuzzy
+msgstr " ޽(_N)"
+
+#: src/buddy.c:2496
 msgid "_Get User Info"
-msgstr "  "
-
-#: src/buddy.c:2643
+msgstr "  (_G)"
+
+#: src/buddy.c:2501
 msgid "Import Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2650
-#, fuzzy
+#: src/buddy.c:2508
 msgid "Hide"
 msgstr ""
 
-#: src/buddy.c:2657
+#: src/buddy.c:2515
 msgid "Tools"
 msgstr ""
 
-#: src/buddy.c:2667
+#: src/buddy.c:2525
 msgid "Buddy Pounce"
 msgstr "ģ˸"
 
-#: src/buddy.c:2674
-#, fuzzy
+#: src/buddy.c:2532
 msgid "_Accounts..."
-msgstr ""
-
-#: src/buddy.c:2677
-#, fuzzy
+msgstr "(_A)..."
+
+#: src/buddy.c:2535
 msgid "_Preferences..."
-msgstr "ȯ漳"
-
-#: src/buddy.c:2683
+msgstr "⺻ (_P)..."
+
+#: src/buddy.c:2538
+msgid "_File Transfers..."
+msgstr " (_F)..."
+
+#: src/buddy.c:2544
 msgid "Protocol Actions"
 msgstr "  "
 
-#: src/buddy.c:2687
-#, fuzzy
+#: src/buddy.c:2548
 msgid "Pr_ivacy..."
-msgstr "̹"
-
-#: src/buddy.c:2690
-#, fuzzy
+msgstr "̹(_I)..."
+
+#: src/buddy.c:2551
 msgid "_View System Log..."
-msgstr "ý α "
-
-#: src/buddy.c:2695
+msgstr "ý α (_V)..."
+
+#: src/buddy.c:2556
 msgid "Help"
 msgstr ""
 
-#: src/buddy.c:2699
+#: src/buddy.c:2560
 msgid "Online Help"
 msgstr "¶ "
 
-#: src/buddy.c:2700
+#: src/buddy.c:2561
 msgid "Debug Window"
-msgstr " â"
-
-#: src/buddy.c:2704
+msgstr " â"
+
+#: src/buddy.c:2565
 msgid "About Gaim"
 msgstr "..."
 
-#: src/buddy.c:2721 src/prefs.c:1395
+#: src/buddy.c:2582 src/prefs.c:1707
 msgid "Buddy List"
 msgstr "ģ "
 
-#: src/buddy.c:2772
+#: src/buddy.c:2633
 msgid "Add a new Buddy"
-msgstr " ģ ߰"
-
-#: src/buddy.c:2773
+msgstr " ģ ϱ"
+
+#: src/buddy.c:2634
 msgid "Add a new Group"
-msgstr " ׷ ߰"
-
-#: src/buddy.c:2774
+msgstr " ׷ ϱ"
+
+#: src/buddy.c:2635
 msgid "Remove selected Buddy/Group"
-msgstr " ģ ׷ "
-
-#: src/buddy.c:2797
+msgstr " ģ Ǵ ׷ "
+
+#: src/buddy.c:2658
 msgid "Edit Buddies"
-msgstr ""
-
-#: src/buddy_chat.c:269
+msgstr "ģ "
+
+#: src/buddy_chat.c:245
+#, fuzzy
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "     ִ  ϴ."
+
+#: src/buddy_chat.c:258
 msgid "Join Chat"
 msgstr "ä "
 
-#: src/buddy_chat.c:286
+#: src/buddy_chat.c:274
 msgid "Join Chat As:"
 msgstr "ä  :"
 
-#: src/buddy_chat.c:307
+#. Join button.
+#: src/buddy_chat.c:297
 msgid "Join"
 msgstr ""
 
-#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1446
-#: src/buddy_chat.c:1540
-msgid "Invite"
-msgstr "ʴ"
-
-#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
-msgid "Buddy"
-msgstr "ģ"
-
-#: src/buddy_chat.c:420
-msgid "Message"
-msgstr "޽"
-
-#: src/buddy_chat.c:457
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr " - ȭǷ ģ ʴ"
-
-#: src/buddy_chat.c:870
-msgid "Un-Ignore"
-msgstr " "
-
-#: src/buddy_chat.c:872 src/prefs.c:280
-msgid "Ignore"
-msgstr ""
-
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1651
-#: src/buddy_chat.c:1684
-#, c-format
-msgid "%d %s in room"
-msgstr "%d %s() ȭǿ ֽϴ."
-
-#: src/buddy_chat.c:957
+#: src/conversation.c:401
+msgid "Unable to send message. The message is too large."
+msgstr "޽   ϴ. ޽ ʹ Ůϴ."
+
+#: src/conversation.c:407
+msgid "Unable to send message."
+msgstr "޽   ϴ."
+
+#: src/conversation.c:1937
 #, c-format
 msgid "%s entered the room."
-msgstr "%s ȭǿ ̽ϴ."
-
-#: src/buddy_chat.c:959
-#, fuzzy, c-format
+msgstr "%s ȭǿ Խϴ."
+
+#: src/conversation.c:1940
+#, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s ȭǿ ̽ϴ."
-
-#: src/buddy_chat.c:1038
+msgstr "%s [<I>%s</I>] ȭǿ Խϴ."
+
+#: src/conversation.c:1989
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s ȭ %s ٲټ̽ϴ."
-
-#: src/buddy_chat.c:1096
+msgstr "%s %s() ȭ ٲϴ."
+
+#: src/conversation.c:2032
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s ȭǿ ̽ϴ. (%s)"
-
-#: src/buddy_chat.c:1098
+msgstr "%s ȭǿ ϴ. (%s)"
+
+#: src/conversation.c:2034
 #, c-format
 msgid "%s left the room."
-msgstr "%s ȭǿ ̽ϴ."
-
-#: src/buddy_chat.c:1204
-msgid "Gaim - Group Chats"
-msgstr " - ׷ ä"
-
-#: src/buddy_chat.c:1284
-msgid "Topic:"
-msgstr ":"
-
-#: src/buddy_chat.c:1323
-msgid "0 people in room"
-msgstr "ȭǿ ƹ ϴ."
-
-#: src/buddy_chat.c:1430 src/buddy_chat.c:1539 src/buddy_chat.c:1571
-#: src/conversation.c:2874
-msgid "Send"
-msgstr ""
-
-#: src/buddy_chat.c:1586 src/conversation.c:2906
-msgid "Warn"
-msgstr ""
-
-#: src/buddy_chat.c:1592 src/conversation.c:2925
-msgid "Block"
-msgstr ""
-
-#: src/conversation.c:443
-msgid "Gaim - Insert Image"
-msgstr " - ׸ "
-
-#: src/conversation.c:1305
-#, fuzzy
-msgid "Unable to send message.  The message is too large"
-msgstr "޽   ϴ : ʹ Ůϴ."
-
-#: src/conversation.c:1309
-#, fuzzy
-msgid "Unable to send message"
-msgstr "޽   ϴ : ʹ Ůϴ."
-
-#: src/conversation.c:2043
-#, fuzzy
-msgid "_Save Conversation"
-msgstr "ȭ "
-
-#: src/conversation.c:2045
-msgid "View _History"
-msgstr ""
-
-#.
-#. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
-#: src/conversation.c:2052
-#, fuzzy
-msgid "Insert _URL"
-msgstr "ũ "
-
-#: src/conversation.c:2053
-#, fuzzy
-msgid "Insert _Image"
-msgstr "޽ ׸ "
-
-#: src/conversation.c:2058
-#, fuzzy
-msgid "_Close"
-msgstr "ݱ"
-
-#: src/conversation.c:2063
-msgid "Options"
-msgstr "ɼ"
-
-#. Logging
-#: src/conversation.c:2068
-#, fuzzy
-msgid "Enable _Logging"
-msgstr " ϱ"
-
-#: src/conversation.c:2086
-#, fuzzy
-msgid "Enable _Sounds"
-msgstr " ϱ"
-
-#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
-msgid " [TYPING]"
-msgstr ""
-
-#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
-msgid " [TYPED]"
-msgstr ""
-
-#: src/conversation.c:2689
-msgid "Gaim - Conversations"
-msgstr " - ȭ"
-
-#: src/conversation.c:2802
-msgid "Send message as: "
-msgstr "äý  :"
-
-#: src/conversation.c:3426
-msgid "Gaim - Save Icon"
-msgstr " -  "
-
-#: src/conversation.c:3460
-msgid "Disable Animation"
-msgstr "ִϸ̼ "
-
-#: src/conversation.c:3467
-msgid "Enable Animation"
-msgstr "ִϸ̼ "
-
-#: src/conversation.c:3473
-msgid "Hide Icon"
-msgstr " "
-
-#: src/conversation.c:3479
-msgid "Save Icon As..."
-msgstr " ̸  "
-
-#: src/dialogs.c:422
+msgstr "%s ȭǿ ϴ."
+
+#: src/conversation.c:2218
+msgid "Last created window"
+msgstr "  â"
+
+#: src/conversation.c:2220
+msgid "New window"
+msgstr " â"
+
+#: src/conversation.c:2222
+msgid "By group"
+msgstr "׷"
+
+#: src/conversation.c:2224
+msgid "By account"
+msgstr ""
+
+#: src/dialogs.c:408
+msgid "Gaim - Warn User"
+msgstr " -  "
+
+#: src/dialogs.c:408
+msgid "_Warn"
+msgstr "(_W)"
+
+#: src/dialogs.c:424
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2868,547 +3108,1172 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:431
-#, fuzzy
+#: src/dialogs.c:433
 msgid "Warn _anonymously?"
-msgstr "͸  ?"
-
-#: src/dialogs.c:438
-#, fuzzy
+msgstr "͸  (A)?"
+
+#: src/dialogs.c:440
 msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "͸    ų  ֽϴ."
-
-#: src/dialogs.c:458
+msgstr "<b>͸    ų  ֽϴ.</b>"
+
+#: src/dialogs.c:462
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
-msgstr "'%s'  ģϿ մϴ.\n"
-
-#: src/dialogs.c:706
+msgstr "'%s' ģϿ մϴ.\n"
+
+#: src/dialogs.c:482
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "%s ģ Ͽ մϴ. ұ?"
+
+#: src/dialogs.c:483
+msgid "Remove Buddy"
+msgstr "ģ "
+
+#: src/dialogs.c:702
+msgid "Gaim - New Message"
+msgstr "Gaim -  ޽"
+
+#: src/dialogs.c:720
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 
-#: src/dialogs.c:722 src/dialogs.c:816
-#, fuzzy
+#: src/dialogs.c:736 src/dialogs.c:834
 msgid "_Screenname:"
-msgstr "̵:"
-
-#: src/dialogs.c:735 src/dialogs.c:829
-#, fuzzy
+msgstr "̵(_S):"
+
+#: src/dialogs.c:751 src/dialogs.c:850
 msgid "_Account:"
-msgstr ":"
-
-#: src/dialogs.c:804
+msgstr "(_A):"
+
+#: src/dialogs.c:803
+msgid "Gaim - Get User Info"
+msgstr " -   "
+
+#: src/dialogs.c:822
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 
-#: src/dialogs.c:956
+#: src/dialogs.c:976
 msgid "Gaim - Add Group"
-msgstr " - ׷ ߰"
-
-#: src/dialogs.c:973
+msgstr "Gaim - ׷ ϱ"
+
+#: src/dialogs.c:993
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 
-#: src/dialogs.c:982 src/dialogs.c:4356
-#, fuzzy
+#: src/dialogs.c:1002 src/dialogs.c:4468
 msgid "_Group:"
-msgstr "׷"
-
-#: src/dialogs.c:1069
+msgstr "׷(_G):"
+
+#: src/dialogs.c:1089
 msgid "Gaim - Add Buddy"
-msgstr " - ģ ߰"
-
-#: src/dialogs.c:1088
+msgstr "Gaim - ģ ϱ"
+
+#: src/dialogs.c:1108
 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 ""
 
-#: src/dialogs.c:1107
-#, fuzzy
+#: src/dialogs.c:1127
 msgid "Screen Name"
-msgstr "̵: "
+msgstr "̵"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1139
+#: src/dialogs.c:1159
 msgid "Add To"
 msgstr ""
 
-#: src/dialogs.c:1468
-#, fuzzy
+#: src/dialogs.c:1489
 msgid "Gaim - Privacy"
-msgstr " - ڸ!"
-
-#: src/dialogs.c:1479
+msgstr "Gaim - ̹"
+
+#: src/dialogs.c:1500
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: src/dialogs.c:1488
-msgid "Set privacy for:"
-msgstr " :"
-
-#: src/dialogs.c:1505
-msgid "Allow all users to contact me"
-msgstr " ڰ   ֵ "
-
 #: src/dialogs.c:1509
-#, fuzzy
+msgid "Set privacy for:"
+msgstr " :"
+
+#: src/dialogs.c:1526
+msgid "Allow all users to contact me"
+msgstr " ڰ   ֵ "
+
+#: src/dialogs.c:1530
 msgid "Allow only users on my buddy list"
 msgstr " Ͽ ִ ڸ   ֵ "
 
-#: src/dialogs.c:1513
+#: src/dialogs.c:1534
 msgid "Allow only the users below"
 msgstr " Ͽ ִ ڸ   ֵ "
 
-#: src/dialogs.c:1551
+#: src/dialogs.c:1572
 msgid "Deny all users"
 msgstr " ڸ ź"
 
-#: src/dialogs.c:1555
+#: src/dialogs.c:1576
 msgid "Block the users below"
 msgstr " Ͽ ִ ڸ "
 
-#: src/dialogs.c:1620
+#: src/dialogs.c:1641
 msgid "Please enter a buddy to pounce."
 msgstr "ģ˸  ģ Էϼ."
 
-#: src/dialogs.c:1759
+#: src/dialogs.c:1780
 msgid "Gaim - New Buddy Pounce"
-msgstr " -  ģ˸"
+msgstr "Gaim -  ģ˸"
 
 #. <pounce type="who">
-#: src/dialogs.c:1769
+#: src/dialogs.c:1790
 msgid "Pounce Who"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1780
+#: src/dialogs.c:1801
 msgid "Account"
 msgstr ""
 
+#: src/dialogs.c:1810 src/dialogs.c:3879
+msgid "Buddy"
+msgstr "ģ"
+
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1806
+#: src/dialogs.c:1827
 msgid "Pounce When"
 msgstr "ģ˸ - ?"
 
-#: src/dialogs.c:1816
+#: src/dialogs.c:1837
 msgid "Pounce on sign on"
 msgstr "ģ   ˸"
 
-#: src/dialogs.c:1825
+#: src/dialogs.c:1846
 msgid "Pounce on return from away"
 msgstr "ģ ڸ򿡼 ƿ  ˸"
 
-#: src/dialogs.c:1834
+#: src/dialogs.c:1855
 msgid "Pounce on return from idle"
 msgstr "ģ Կ ƿ  ˸"
 
-#: src/dialogs.c:1843
+#: src/dialogs.c:1864
 msgid "Pounce when buddy is typing to you"
 msgstr "ģ  Ÿ ϸ ˸"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1853
+#: src/dialogs.c:1874
 msgid "Pounce Action"
 msgstr "ģ˸ - ൿ?"
 
-#: src/dialogs.c:1864
+#: src/dialogs.c:1885
 msgid "Open IM Window"
 msgstr "޽ â "
 
-#: src/dialogs.c:1873
+#: src/dialogs.c:1894
 msgid "Popup Notification"
 msgstr "˾â  "
 
-#: src/dialogs.c:1882 src/prefs.c:296
+#: src/dialogs.c:1903 src/prefs.c:519
 msgid "Send Message"
 msgstr "޽ "
 
-#: src/dialogs.c:1903
+#: src/dialogs.c:1925
 msgid "Execute command on pounce"
 msgstr "ģ˸  "
 
-#: src/dialogs.c:1925
+#: src/dialogs.c:1948
 msgid "Play sound on pounce"
 msgstr "ģ˸ Ҹ "
 
 #. </pounce type="action">
-#: src/dialogs.c:1947
+#: src/dialogs.c:1971
 msgid "Save this pounce after activation"
 msgstr " ۵  ģ˸ "
 
-#: src/dialogs.c:1967
-#, fuzzy
+#: src/dialogs.c:1991
 msgid "_Save"
-msgstr ""
-
-#: src/dialogs.c:1973
-#, fuzzy
+msgstr "(_S)"
+
+#: src/dialogs.c:1997
 msgid "C_ancel"
-msgstr ""
-
-#: src/dialogs.c:2044
+msgstr "(A)"
+
+#: src/dialogs.c:2068
 msgid "Gaim - Set Dir Info"
-msgstr " - 丮  "
-
-#: src/dialogs.c:2052
+msgstr "Gaim - 丮  "
+
+#: src/dialogs.c:2076
 msgid "Directory Info"
 msgstr "丮 "
 
-#: src/dialogs.c:2074
+#: src/dialogs.c:2086
+#, fuzzy, c-format
+msgid "Setting Dir Info for %s:"
+msgstr "丮  "
+
+#: src/dialogs.c:2098
 msgid "Allow Web Searches To Find Your Info"
-msgstr " Ͽ   ˻  ֵ "
+msgstr "    ã  ֵ "
 
 #. Line 1
-#: src/dialogs.c:2077 src/dialogs.c:2777
+#: src/dialogs.c:2101 src/dialogs.c:2770
 msgid "First Name"
 msgstr ""
 
 #. Line 2
-#: src/dialogs.c:2088 src/dialogs.c:2789
+#: src/dialogs.c:2112 src/dialogs.c:2782
 msgid "Middle Name"
 msgstr "߰ ̸"
 
 #. Line 3
-#: src/dialogs.c:2100 src/dialogs.c:2801
+#: src/dialogs.c:2124 src/dialogs.c:2794
 msgid "Last Name"
 msgstr "̸"
 
 #. Line 4
-#: src/dialogs.c:2111 src/dialogs.c:2813
+#: src/dialogs.c:2135 src/dialogs.c:2806
 msgid "Maiden Name"
 msgstr "ȥ  ̸"
 
 #. Line 6
-#: src/dialogs.c:2133 src/dialogs.c:2836
+#: src/dialogs.c:2157 src/dialogs.c:2829
 msgid "State"
 msgstr "/"
 
-#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
-#: src/dialogs.c:5216
+#: src/dialogs.c:2200 src/dialogs.c:2388 src/dialogs.c:3678 src/dialogs.c:4358
+#: src/dialogs.c:5325
 msgid "Save"
 msgstr ""
 
-#: src/dialogs.c:2198
+#: src/dialogs.c:2222
 msgid "New Passwords Do Not Match"
 msgstr " н尡 ġ ʽϴ"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2227
 msgid "Fill out all fields completely"
 msgstr " ׸  äʽÿ"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2252
 msgid "Gaim - Password Change"
-msgstr " - йȣ "
-
-#: src/dialogs.c:2257
+msgstr "Gaim - йȣ ٲٱ"
+
+#: src/dialogs.c:2271
+msgid "Changing password for %s:"
+msgstr "йȣ ٲٱ(%s):"
+
+#: src/dialogs.c:2281
 msgid "Original Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:2271
+#: src/dialogs.c:2295
 msgid "New Password"
 msgstr " йȣ"
 
-#: src/dialogs.c:2285
+#: src/dialogs.c:2309
 msgid "New Password (again)"
 msgstr " йȣ Ȯ"
 
 #. Build OK Button
-#: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
-#: src/dialogs.c:3002 src/dialogs.c:4471
+#: src/dialogs.c:2323 src/dialogs.c:2461 src/dialogs.c:2751 src/dialogs.c:2925
+#: src/dialogs.c:4577
 msgid "OK"
 msgstr "Ȯ"
 
-#: src/dialogs.c:2327
+#: src/dialogs.c:2351
 msgid "Gaim - Set User Info"
-msgstr " -   "
-
-#: src/dialogs.c:2442
+msgstr "Gaim -   "
+
+#: src/dialogs.c:2361
+#, c-format
+msgid "Changing info for %s:"
+msgstr ""
+
+#: src/dialogs.c:2447
 msgid "Below are the results of your search: "
-msgstr "˻   ϴ: "
-
-#: src/dialogs.c:2574
+msgstr "ã   ϴ: "
+
+#: src/dialogs.c:2552
 msgid "Permit"
 msgstr ""
 
-#: src/dialogs.c:2614
+#: src/dialogs.c:2592
 msgid "Gaim - Add Permit"
-msgstr " -   ߰"
-
-#: src/dialogs.c:2616
+msgstr "Gaim -   ϱ"
+
+#: src/dialogs.c:2594
 msgid "Gaim - Add Deny"
-msgstr " - ź  ߰"
-
-#: src/dialogs.c:2675
+msgstr "Gaim - ź  ϱ"
+
+#: src/dialogs.c:2664
 msgid "Gaim - Log Conversation"
-msgstr " - ȭ "
-
-#: src/dialogs.c:2753 src/dialogs.c:2914
+msgstr "Gaim - ȭ "
+
+#: src/dialogs.c:2746 src/dialogs.c:2907
 msgid "Search for Buddy"
 msgstr "ģ ã"
 
-#: src/dialogs.c:2881
+#: src/dialogs.c:2874
 msgid "Gaim - Find Buddy By Info"
-msgstr " -  ģ ã"
-
-#: src/dialogs.c:2908
+msgstr "Gaim -  ģ ã"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Find Buddy By Email"
-msgstr " -  ּҷ ģ ã"
-
-#: src/dialogs.c:2997
-msgid "Insert Link"
-msgstr "ũ "
-
-#: src/dialogs.c:3048
-msgid "Gaim - Add URL"
-msgstr " - URL ߰"
-
-#: src/dialogs.c:3147 src/dialogs.c:3164
+msgstr "Gaim - ̸Ϸ ģ ã"
+
+#: src/dialogs.c:3013
+msgid "Gaim - Insert Link"
+msgstr "Gaim - ũ "
+
+#: src/dialogs.c:3015
+msgid "Insert"
+msgstr ""
+
+#: src/dialogs.c:3034
+msgid ""
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+
+#: src/dialogs.c:3201 src/dialogs.c:3218
 msgid "Select Text Color"
 msgstr "  "
 
-#: src/dialogs.c:3192 src/dialogs.c:3209
+#: src/dialogs.c:3249 src/dialogs.c:3266
 msgid "Select Background Color"
 msgstr "  "
 
-#: src/dialogs.c:3284 src/dialogs.c:3308
+#: src/dialogs.c:3352 src/dialogs.c:3375
 msgid "Select Font"
 msgstr "۲ "
 
-#: src/dialogs.c:3385
+#: src/dialogs.c:3450
 msgid "Import to:"
 msgstr " :"
 
-#: src/dialogs.c:3409
+#: src/dialogs.c:3474
 msgid "Gaim - Import Buddy List"
-msgstr " - ģ "
+msgstr "Gaim - ģ "
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3470
-#, fuzzy
+#: src/dialogs.c:3534
 msgid "You cannot save an away message with a blank title"
 msgstr "ڸ ޽     ˴ϴ"
 
-#: src/dialogs.c:3471
+#: src/dialogs.c:3535
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3478
+#: src/dialogs.c:3544
 msgid "You cannot create an empty away message"
 msgstr "ڸ ޽    ˴ϴ"
 
-#: src/dialogs.c:3541
+#: src/dialogs.c:3609
 msgid "Gaim - New away message"
-msgstr " -  ڸ ޽"
-
-#: src/dialogs.c:3550
+msgstr "Gaim -  ڸ ޽"
+
+#: src/dialogs.c:3618
 msgid "New away message"
 msgstr " ڸ ޽"
 
-#: src/dialogs.c:3563
+#: src/dialogs.c:3631
 msgid "Away title: "
 msgstr "ڸ : "
 
-#: src/dialogs.c:3614
+#: src/dialogs.c:3682
 msgid "Save & Use"
 msgstr "  "
 
-#: src/dialogs.c:3618
+#: src/dialogs.c:3686
 msgid "Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3752
+#: src/dialogs.c:3832
 msgid "Smile!"
 msgstr "!"
 
-#: src/dialogs.c:3841
+#: src/dialogs.c:3924
 msgid "Gaim - Alias Buddy"
-msgstr " -  "
-
-#: src/dialogs.c:3879 src/dialogs.c:3886
-#, fuzzy, c-format
+msgstr "Gaim -  "
+
+#: src/dialogs.c:3962 src/dialogs.c:3969
+#, c-format
 msgid "Couldn't write to %s."
-msgstr "ȣƮ   ϴ."
-
-#: src/dialogs.c:3910
+msgstr "%s   ϴ."
+
+#: src/dialogs.c:3993
 msgid "Gaim - Save Log File"
-msgstr " - α "
-
-#: src/dialogs.c:3940
-#, fuzzy, c-format
+msgstr "Gaim - α "
+
+#: src/dialogs.c:4023
+#, c-format
 msgid "Couldn't remove file %s."
-msgstr "  %s   ϴ."
-
-#: src/dialogs.c:3967
+msgstr "%s    ϴ."
+
+#: src/dialogs.c:4042
+msgid "Gaim - Clear Log"
+msgstr "Gaim - α "
+
+#: src/dialogs.c:4051
 msgid "Really clear log?"
 msgstr " α׸ ?"
 
-#: src/dialogs.c:3982
+#: src/dialogs.c:4061
 msgid "Okay"
 msgstr "Ȯ"
 
-#: src/dialogs.c:4163
+#: src/dialogs.c:4098
+msgid "Couldn't open log file %s."
+msgstr "α  %s()   ϴ."
+
+#: src/dialogs.c:4230
+msgid "Gaim - Conversations with %s"
+msgstr "Gaim - %s԰ ȭ"
+
+#: src/dialogs.c:4232
+msgid "Gaim - System Log"
+msgstr "Gaim - ý α"
+
+#: src/dialogs.c:4253
+msgid "Couldn't open log file %s"
+msgstr "α  %s()   "
+
+#: src/dialogs.c:4274
 msgid "Date"
 msgstr "¥"
 
-#: src/dialogs.c:4226
+#: src/dialogs.c:4331
 msgid "Conversation"
 msgstr "ȭ"
 
-#: src/dialogs.c:4247
+#: src/dialogs.c:4353
 msgid "Clear"
 msgstr ""
 
-#: src/dialogs.c:4330
+#: src/dialogs.c:4442
 msgid "Gaim - Rename Group"
-msgstr " - ׷ ̸ "
-
-#: src/dialogs.c:4347
+msgstr "Gaim - ׷ ̸ ٲٱ"
+
+#: src/dialogs.c:4459
 msgid "Please enter a new name for the selected group.\n"
 msgstr ""
 
-#: src/dialogs.c:4436
+#: src/dialogs.c:4547
 msgid "Gaim - Rename Buddy"
-msgstr " - ģ ̸ "
-
-#: src/dialogs.c:4445
+msgstr "Gaim - ģ ̸ ٲٱ"
+
+#: src/dialogs.c:4556
 msgid "Rename Buddy"
-msgstr "ģ ̸ "
-
-#: src/dialogs.c:4452
+msgstr "ģ ̸ ٲٱ"
+
+#: src/dialogs.c:4563
 msgid "New name:"
 msgstr " ̸:"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4529
+#: src/dialogs.c:4640
 msgid "Gaim - Select Perl Script"
-msgstr " -  ũƮ "
-
-#: src/gaimrc.c:1348
+msgstr "Gaim -  ũƮ "
+
+#: src/ft.c:126
+msgid "%s is not a valid filename.\n"
+msgstr "%s (/) ߸ ϸԴϴ.\n"
+
+#: src/ft.c:140
+msgid "%s was not found.\n"
+msgstr "%s  ã  .\n"
+
+#: src/ft.c:666
+#, fuzzy, c-format
+msgid "File transfer to %s aborted.\n"
+msgstr " ˸ "
+
+#: src/ft.c:668
+#, fuzzy, c-format
+msgid "File transfer from %s aborted.\n"
+msgstr " ˸ "
+
+#: src/gaim-remote.c:32
+#, c-format
+msgid ""
+"Usage: %s command [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       quit                     Close running copy of Gaim\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [commmand]    Show help for command\n"
+msgstr ""
+
+#. for people like myself, who are too lazy to add an away msg :)
+#: src/gaimrc.c:48
+msgid "sorry, i ran out for a while. bbl"
+msgstr ""
+
+#: src/gaimrc.c:265 src/gaimrc.c:298 src/gaimrc.c:1294
+msgid "boring default"
+msgstr ""
+
+#: src/gaimrc.c:1387
 #, c-format
 msgid "Could not open config file %s."
-msgstr "  %s   ϴ."
-
-#: src/html.c:185
+msgstr "  %s()   ϴ."
+
+#: src/gtkconv.c:207
+msgid "Gaim - Insert Image"
+msgstr "Gaim - ׸ "
+
+#: src/gtkconv.c:751
+msgid "Un-Ignore"
+msgstr " "
+
+#: src/gtkconv.c:753 src/prefs.c:503
+msgid "Ignore"
+msgstr ""
+
+#: src/gtkconv.c:863
+msgid "Gaim - Invite Buddy Into Chat Room"
+msgstr "Gaim - ȭǷ ģ ʴ"
+
+#. Put our happy label in it.
+#: src/gtkconv.c:891
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#: src/gtkconv.c:912
+msgid "_Buddy:"
+msgstr "ģ(_B):"
+
+#: src/gtkconv.c:932
+msgid "_Message:"
+msgstr "޽(_M):"
+
+#. Build the Send As menu
+#: src/gtkconv.c:2054
+msgid "_Send As"
+msgstr ".. (_S)"
+
+#. Conversation menu
+#: src/gtkconv.c:2414
+msgid "/_Conversation"
+msgstr "/ȭ(_C)"
+
+#: src/gtkconv.c:2415
+msgid "/Conversation/_Save As..."
+msgstr "/ȭ(C)/ٸ ̸ (_S)..."
+
+#: src/gtkconv.c:2417
+msgid "/Conversation/View _History..."
+msgstr "/ȭ(C)/ ȭ (_H)..."
+
+#: src/gtkconv.c:2419
+msgid "/Conversation/Insert _URL..."
+msgstr "/ȭ(C)/_URL ֱ..."
+
+#: src/gtkconv.c:2421
+msgid "/Conversation/Insert _Image..."
+msgstr "/ȭ(C)/׸ ֱ(_I)..."
+
+#: src/gtkconv.c:2424
+msgid "/Conversation/_Close"
+msgstr "/ȭ(C)/ݱ(_C)"
+
+#. Options
+#: src/gtkconv.c:2428
+msgid "/_Options"
+msgstr "/ɼ(_O)"
+
+#: src/gtkconv.c:2429
+msgid "/Options/Enable _Logging"
+msgstr "/ɼ(O)/ϱ(_L)"
+
+#: src/gtkconv.c:2430
+msgid "/Options/Enable _Sounds"
+msgstr "/ɼ(O)/Ҹ (_S)"
+
+#. From right to left...
+#. Send button
+#: src/gtkconv.c:2501 src/gtkconv.c:2503 src/gtkconv.c:2600 src/gtkconv.c:2602
+#: src/gtkconv.c:4738
+msgid "Send"
+msgstr ""
+
+#: src/gtkconv.c:2523 src/gtkconv.c:3564
+msgid "Add the user to your buddy list"
+msgstr "ģ Ͽ  ϱ"
+
+#: src/gtkconv.c:2529 src/gtkconv.c:3555
+msgid "Remove the user from your buddy list"
+msgstr "ģ Ͽ  "
+
+#. Warn button
+#: src/gtkconv.c:2536
+msgid "Warn"
+msgstr ""
+
+#: src/gtkconv.c:2540
+msgid "Warn the user"
+msgstr " "
+
+#: src/gtkconv.c:2547 src/gtkconv.c:2957
+msgid "Get the user's information"
+msgstr "  "
+
+#. Block button
+#: src/gtkconv.c:2550
+msgid "Block"
+msgstr ""
+
+#: src/gtkconv.c:2554
+msgid "Block the user"
+msgstr " "
+
+#. Invite
+#: src/gtkconv.c:2612 src/gtkconv.c:4741
+msgid "Invite"
+msgstr "ʴ"
+
+#: src/gtkconv.c:2615
+msgid "Invite a user"
+msgstr " ʴ"
+
+#: src/gtkconv.c:2654
+msgid "Bold"
+msgstr "ϰ"
+
+#: src/gtkconv.c:2665
+msgid "Italic"
+msgstr ""
+
+#: src/gtkconv.c:2676
+msgid "Underline"
+msgstr ""
+
+#: src/gtkconv.c:2692
+msgid "Larger font size"
+msgstr " ũ⸦ ũ"
+
+#: src/gtkconv.c:2702
+msgid "Normal font size"
+msgstr " ũ⸦ "
+
+#: src/gtkconv.c:2714
+msgid "Smaller font size"
+msgstr " ũ⸦ ۰"
+
+#: src/gtkconv.c:2728
+msgid "Foreground font color"
+msgstr "ڻ"
+
+#: src/gtkconv.c:2740
+msgid "Background color"
+msgstr " "
+
+#: src/gtkconv.c:2755
+msgid "Insert image"
+msgstr "׸ ֱ"
+
+#: src/gtkconv.c:2766
+msgid "Insert link"
+msgstr "ũ ֱ"
+
+#: src/gtkconv.c:2777
+msgid "Insert smiley"
+msgstr "ϸ ֱ"
+
+#: src/gtkconv.c:2830
+msgid "Topic:"
+msgstr ":"
+
+#. Setup the label telling how many people are in the room.
+#: src/gtkconv.c:2877
+msgid "0 people in room"
+msgstr "ȭǿ ƹ "
+
+#: src/gtkconv.c:2934
+msgid "IM the user"
+msgstr ""
+
+#: src/gtkconv.c:2946
+msgid "Ignore the user"
+msgstr " "
+
+#: src/gtkconv.c:3196 src/prefs.c:575 src/prefs.c:1708
+msgid "Conversations"
+msgstr "ȭ"
+
+#: src/gtkconv.c:3416
+msgid "Close conversation"
+msgstr "ȭ ݱ"
+
+#: src/gtkconv.c:3967 src/gtkconv.c:4089
+#, fuzzy, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d %s ȭǿ ֽϴ."
+msgstr[1] "%d %s ȭǿ ֽϴ."
+
+#: src/gtkconv.c:4444
+msgid "Disable Animation"
+msgstr "ִϸ̼ "
+
+#: src/gtkconv.c:4453
+msgid "Enable Animation"
+msgstr "ִϸ̼ "
+
+#: src/gtkconv.c:4460
+msgid "Hide Icon"
+msgstr " "
+
+#: src/gtkconv.c:4466
+msgid "Save Icon As..."
+msgstr " ̸  ..."
+
+#: src/gtkft.c:103
+msgid "Calculating..."
+msgstr ""
+
+#: src/gtkft.c:106
+msgid "Unknown."
+msgstr "˷ ."
+
+#: src/gtkft.c:143
+#, c-format
+msgid "%.2f KB/s"
+msgstr ""
+
+#: src/gtkft.c:218
+msgid "<b>Receiving From:</b>"
+msgstr "<b>:</b>"
+
+#: src/gtkft.c:221
+msgid "<b>Sending To:</b>"
+msgstr "<b>:</b>"
+
+#: src/gtkft.c:445
+msgid "Progress"
+msgstr ""
+
+#: src/gtkft.c:452
+msgid "Filename"
+msgstr "ϸ"
+
+#: src/gtkft.c:459
+msgid "Size"
+msgstr "ũ"
+
+#: src/gtkft.c:466
+msgid "Remaining"
+msgstr " ð"
+
+#: src/gtkft.c:496
+msgid "Filename:"
+msgstr "ϸ:"
+
+#: src/gtkft.c:497
+msgid "Status:"
+msgstr ":"
+
+#: src/gtkft.c:498
+msgid "Speed:"
+msgstr "ӵ:"
+
+#: src/gtkft.c:499
+msgid "Time Elapsed:"
+msgstr " ð:"
+
+#: src/gtkft.c:500
+msgid "Time Remaining:"
+msgstr " ð:"
+
+#: src/gtkft.c:566
+msgid "File Transfers"
+msgstr " "
+
+#: src/gtkft.c:594
+msgid "_Keep the dialog open"
+msgstr "â (_K)"
+
+#: src/gtkft.c:604
+msgid "_Clear finished transfers"
+msgstr "  (_C)"
+
+#. "Download Details" arrow
+#: src/gtkft.c:613
+msgid "Show download details"
+msgstr "ٿε  ̱"
+
+#: src/gtkft.c:614
+msgid "Hide download details"
+msgstr "ٿε  ߱"
+
+#. Pause button
+#: src/gtkft.c:656
+msgid "_Pause"
+msgstr " (_P)"
+
+#. Resume button
+#: src/gtkft.c:666
+msgid "_Resume"
+msgstr "(_R)"
+
+#: src/gtkft.c:983
+msgid "That file already exists. Would you like to overwrite it?"
+msgstr " ̹ ֽϴ.  ?"
+
+#: src/gtkft.c:1000
+msgid "That file does not exist."
+msgstr " ϴ."
+
+#: src/gtkft.c:1024
+msgid "Gaim - Open..."
+msgstr "Gaim - ..."
+
+#: src/gtkft.c:1073
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s %s   (%s)"
+
+#: src/gtkimhtml.c:311
+msgid "_Copy Link Location"
+msgstr "  (_C)"
+
+#: src/gtkimhtml.c:318
+msgid "_Open Link in Browser"
+msgstr " (_O)"
+
+#: src/gtkutils.c:315
+msgid "Gaim - Save Icon"
+msgstr "Gaim -  "
+
+#: src/html.c:279
 #, c-format
 msgid "Received: '%s'\n"
 msgstr ": '%s'\n"
 
-#: src/html.c:223
+#: src/html.c:317
 msgid "g003: Error opening connection.\n"
 msgstr "g003:   ߻.\n"
 
-#: src/multi.c:235
-#, fuzzy
+#: src/list.c:57
+#, c-format
+msgid ""
+"%s was not removed from your buddy list, because your account (%s) is not "
+"logged in."
+msgstr ""
+
+#: src/list.c:60
+msgid "Buddy Not Removed"
+msgstr ""
+
+#: src/list.c:97
+#, c-format
+msgid ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies, and the group were not removed.\n"
+msgstr ""
+
+#: src/list.c:101
+msgid "Group Not Removed"
+msgstr ""
+
+#: src/list.c:263
+msgid "Invalid Groupname"
+msgstr "߸ ׷ ̸"
+
+#: src/list.c:999
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded."
+msgstr ""
+
+#: src/list.c:1001
+msgid "Buddy List Error"
+msgstr "ģ  "
+
+#. rob wants to inform the user that their buddy lists are
+#. * being converted
+#: src/list.c:1007
+#, c-format
+msgid ""
+"Gaim is converting your old buddy lists to a new format, which will now be "
+"located at %s"
+msgstr ""
+
+#: src/list.c:1010
+msgid "Converting Buddy List"
+msgstr "ģ  ȯ"
+
+#: src/log.c:118
+msgid "Gaim - Save Conversation"
+msgstr " - ȭ "
+
+#: src/log.c:159 src/log.c:180 src/log.c:193
+msgid "Unable to make directory %s for logging"
+msgstr "  %s 丮   "
+
+#: src/log.c:247 src/log.c:263
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr ""
+
+#: src/log.c:250 src/log.c:266
+#, c-format
+msgid "IM Sessions with %s"
+msgstr ""
+
+#: src/log.c:297
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:302
+#, fuzzy, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr "%s  ϴ"
+
+#: src/log.c:307
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr ""
+
+#: src/log.c:312
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:317
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:322
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:327
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr ""
+
+#: src/log.c:334
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:339
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr ""
+
+#: src/log.c:344
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr ""
+
+#: src/log.c:349
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr ""
+
+#: src/log.c:354
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr ""
+
+#: src/log.c:360
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr ""
+
+#: src/log.c:372
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr ""
+
+#: src/log.c:377
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr ""
+
+#: src/log.c:382
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr ""
+
+#: src/log.c:387
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr ""
+
+#: src/log.c:392
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr ""
+
+#: src/log.c:398
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr ""
+
+#: src/main.c:176
+msgid "Please enter your login."
+msgstr "  Էϼ."
+
+#: src/main.c:263
+msgid "<New User>"
+msgstr ""
+
+#: src/main.c:306
+msgid "Gaim - Login"
+msgstr "Gaim - α"
+
+#: src/main.c:329
+msgid "Screen Name:"
+msgstr "̵: "
+
+#. And now for the buttons
+#: src/main.c:363
+msgid "Accounts"
+msgstr ""
+
+#: src/main.c:373
+msgid "Settings"
+msgstr ""
+
+#: src/main.c:379 src/win32/systray.c:145
+msgid "Sign On"
+msgstr ""
+
+#: src/multi.c:253
 msgid "Screenname"
-msgstr "̵:"
-
-#: src/multi.c:263
-#, fuzzy
+msgstr "̵"
+
+#: src/multi.c:281
 msgid "Protocol"
-msgstr ":"
-
-#: src/multi.c:542
+msgstr ""
+
+#: src/multi.c:584
 msgid "Gaim - Load Buddy Icon"
-msgstr " - ģ  ҷ"
-
-#: src/multi.c:585
+msgstr "Gam - ģ  ҷ"
+
+#: src/multi.c:627
 msgid "Buddy Icon File:"
 msgstr "ģ  :"
 
-#: src/multi.c:598
+#: src/multi.c:640
 msgid "Browse"
 msgstr "Ž"
 
-#: src/multi.c:603 src/prefs.c:1221
+#: src/multi.c:645 src/prefs.c:911 src/prefs.c:1532
 msgid "Reset"
 msgstr ""
 
-#: src/multi.c:620
-#, fuzzy
+#: src/multi.c:662
 msgid "Login Options"
-msgstr "޲ ɼ"
-
-#: src/multi.c:630
-msgid "Screenname:"
-msgstr "̵:"
-
-#: src/multi.c:653
-msgid "Alias:"
-msgstr ":"
-
-#: src/multi.c:665
-msgid "Protocol:"
-msgstr ":"
+msgstr " ɼ"
 
 #: src/multi.c:672
+msgid "Screenname:"
+msgstr "̵:"
+
+#: src/multi.c:695
+msgid "Alias:"
+msgstr ":"
+
+#: src/multi.c:707
+msgid "Protocol:"
+msgstr ":"
+
+#: src/multi.c:714
 msgid "Remember Password"
 msgstr "н "
 
-#: src/multi.c:673
+#: src/multi.c:715
 msgid "Auto-Login"
 msgstr "ڵ α"
 
-#: src/multi.c:706
-#, fuzzy
+#: src/multi.c:748
 msgid "User Options"
-msgstr "Ϲ ɼ"
-
-#: src/multi.c:715
+msgstr " ɼ"
+
+#: src/multi.c:757
 msgid "New Mail Notifications"
 msgstr "ο  ˸"
 
-#: src/multi.c:767
-#, fuzzy, c-format
+#: src/multi.c:809
+#, c-format
 msgid "%s Options"
-msgstr "ɼ"
-
-#: src/multi.c:809
+msgstr "%s ɼ"
+
+#: src/multi.c:851
 msgid "Register with server"
 msgstr " "
 
-#: src/multi.c:868
+#: src/multi.c:880
+msgid "Proxy Options"
+msgstr "Ͻ ɼ"
+
+#: src/multi.c:894
+msgid "Proxy _Type"
+msgstr "Ͻ (_T)"
+
+#: src/multi.c:964
+msgid "_Host:"
+msgstr "ȣƮ(_H):"
+
+#: src/multi.c:1000
+msgid "_User:"
+msgstr "(_U):"
+
+#: src/multi.c:1016
+msgid "Pa_ssword:"
+msgstr "йȣ(_S):"
+
+#: src/multi.c:1082
 msgid "Gaim - Modify Account"
-msgstr " -  "
-
-#: src/multi.c:1013
-msgid "Enter Password"
-msgstr "н"
-
-#: src/multi.c:1024
-#, fuzzy, c-format
-msgid "Password for %s:"
-msgstr "н:"
-
-#: src/multi.c:1044
-msgid "Signon"
-msgstr ""
-
-#: src/multi.c:1077
+msgstr "Gaim -  "
+
+#: src/multi.c:1205
+msgid "_Login"
+msgstr "(_L)"
+
+#: src/multi.c:1223
+msgid ""
+"Please enter your password for %s.\n"
+"\n"
+msgstr "%s  йȣ Էϼ.\n"
+"\n"
+
+#: src/multi.c:1234
+msgid "_Password"
+msgstr "йȣ(_P):"
+
+#: src/multi.c:1273
 msgid "TOC not found."
-msgstr ""
-
-#: src/multi.c:1078
+msgstr "TOC ã  ϴ."
+
+#: src/multi.c:1274
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:1084
-#, fuzzy
+#: src/multi.c:1280
 msgid "Protocol not found."
-msgstr "  "
-
-#: src/multi.c:1085
+msgstr " ã  ϴ."
+
+#: src/multi.c:1281
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -3416,714 +4281,641 @@
 "  α׿  ϴ. ش  ġ ʾҰų ش "
 "ݿ α  ϴ."
 
-#: src/multi.c:1138
+#: src/multi.c:1361
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr " %s ұ?"
-
-#: src/multi.c:1139
+msgstr " %s() ?"
+
+#: src/multi.c:1362
 msgid "Delete"
-msgstr ""
-
-#: src/multi.c:1187
+msgstr ""
+
+#: src/multi.c:1391
 msgid "Gaim - Account Editor"
-msgstr " -  "
-
-#: src/multi.c:1257
-#, fuzzy
+msgstr "Gaim -  "
+
+#: src/multi.c:1456
 msgid "_Modify"
-msgstr ""
-
-#: src/multi.c:1308
-#, fuzzy
+msgstr "ġ(_S)"
+
+#: src/multi.c:1507
 msgid "Done."
-msgstr " "
-
-#: src/multi.c:1448
-#, fuzzy
+msgstr "Ϸ."
+
+#: src/multi.c:1707
 msgid "Signon: "
-msgstr ": %s"
-
-#: src/multi.c:1505
-#, fuzzy
+msgstr ": "
+
+#: src/multi.c:1765
 msgid "Gaim Account Signon"
-msgstr " -  "
-
-#: src/multi.c:1517
-#, fuzzy
+msgstr "  "
+
+#: src/multi.c:1777
 msgid "Cancel All"
-msgstr ""
-
-#: src/multi.c:1574
+msgstr " "
+
+#: src/multi.c:1834
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1593
+#: src/multi.c:1855
 #, c-format
 msgid "%s was unable to sign on"
-msgstr "%s   ϴ"
-
-#: src/multi.c:1594
+msgstr "%s()   ϴ"
+
+#: src/multi.c:1856
 msgid "Signon Error"
 msgstr " "
 
-#: src/multi.c:1604
+#: src/multi.c:1867
 msgid "Notice"
 msgstr "˸"
 
-#: src/multi.c:1614
+#: src/multi.c:1879
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s  ϴ"
 
-#: src/multi.c:1615
+#: src/multi.c:1880
 msgid "Connection Error"
 msgstr " "
 
-#: src/perl.c:343
+#: src/perl.c:382
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
 
-#: src/prefs.c:180
-#, fuzzy
+#: src/prefs.c:190
 msgid "Interface Options"
-msgstr "Ϲ ɼ"
-
-#. This shouldn't have to wait for user to click OK or APPLY or whatnot
-#. This really shouldn't be in preferences at all
-#: src/prefs.c:183
-#, fuzzy
-msgid "Show _debug window"
-msgstr " â "
-
-#: src/prefs.c:200
-#, fuzzy
+msgstr "̽ ɼ"
+
+#: src/prefs.c:192
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr " Ǿ   г (_I)"
+
+#: src/prefs.c:351
+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 ""
+"Ʒ Ͽ  ϸ ׸ Ͻʽÿ. ο ׸ "
+"  Ƽ ġ  ֽϴ."
+
+#: src/prefs.c:384
+msgid "Icon"
+msgstr ""
+
+#: src/prefs.c:418
 msgid "Style"
-msgstr "/"
-
-#: src/prefs.c:201
-#, fuzzy
+msgstr "Ÿ"
+
+#: src/prefs.c:419
 msgid "_Bold"
-msgstr "β"
-
-#: src/prefs.c:202
-#, fuzzy
+msgstr "β(_B)"
+
+#: src/prefs.c:420
 msgid "_Italics"
-msgstr ""
-
-#: src/prefs.c:203
-#, fuzzy
+msgstr "(_I)"
+
+#: src/prefs.c:421
 msgid "_Underline"
-msgstr ""
-
-#: src/prefs.c:204
-#, fuzzy
+msgstr "(_U)"
+
+#: src/prefs.c:422
 msgid "_Strikethrough"
-msgstr " ģ ۾"
-
-#: src/prefs.c:206
-#, fuzzy
+msgstr " (_S)"
+
+#: src/prefs.c:424
 msgid "Face"
-msgstr ""
-
-#: src/prefs.c:209
-#, fuzzy
+msgstr "۲"
+
+#: src/prefs.c:427
 msgid "Use custo_m face"
-msgstr "ڰ ʹ Ȱ"
-
-#: src/prefs.c:221
+msgstr " ۲ (_M)"
+
+#: src/prefs.c:441
 msgid "Use custom si_ze"
-msgstr ""
-
-#: src/prefs.c:228
+msgstr " ũ (_Z)"
+
+#: src/prefs.c:449
 msgid "Color"
 msgstr ""
 
-#: src/prefs.c:233
-#, fuzzy
+#: src/prefs.c:454
 msgid "_Text color"
-msgstr " "
-
-#: src/prefs.c:249
-#, fuzzy
+msgstr " (_T)"
+
+#: src/prefs.c:471
 msgid "Bac_kground color"
-msgstr "  "
-
-#: src/prefs.c:273 src/prefs.c:369 src/prefs.c:409
-#, fuzzy
+msgstr " (_K)"
+
+#: src/prefs.c:496 src/prefs.c:628 src/prefs.c:668
 msgid "Display"
-msgstr "ģ ǥ"
-
-#: src/prefs.c:274
-#, fuzzy
+msgstr ""
+
+#: src/prefs.c:497
 msgid "Show graphical _smileys"
-msgstr "̸Ƽ ׸ ֱ"
-
-#: src/prefs.c:275
-#, fuzzy
+msgstr "̸Ƽ ׸(_S)"
+
+#: src/prefs.c:498
 msgid "Show _timestamp on messages"
-msgstr "޽ ð ǥ"
-
-#: src/prefs.c:276
-#, fuzzy
+msgstr "޽ ð ֱ(_T)"
+
+#: src/prefs.c:499
 msgid "Show _URLs as links"
-msgstr "URL  ũ ֱ"
-
-#: src/prefs.c:278
-#, fuzzy
+msgstr "_URL ũ"
+
+#: src/prefs.c:501
 msgid "_Highlight misspelled words"
-msgstr "Ʋ öڸ Ͽ ǥ"
-
-#: src/prefs.c:281
-#, fuzzy
+msgstr "Ʋ öڸ (_H)"
+
+#: src/prefs.c:504
 msgid "Ignore c_olors"
-msgstr " "
-
-#: src/prefs.c:282
-#, fuzzy
+msgstr " (_O)"
+
+#: src/prefs.c:505
 msgid "Ignore font _faces"
-msgstr "۲ "
-
-#: src/prefs.c:283
-#, fuzzy
+msgstr "۲ (_F)"
+
+#: src/prefs.c:506
 msgid "Ignore font si_zes"
-msgstr " ũ "
-
-#: src/prefs.c:297
-#, fuzzy
+msgstr " ũ (_Z)"
+
+#: src/prefs.c:520
 msgid "_Enter sends message"
-msgstr "Ű  ޽ "
-
-#: src/prefs.c:298
-#, fuzzy
+msgstr "Ű ޽ (_E)"
+
+#: src/prefs.c:521
 msgid "C_ontrol-Enter sends message"
-msgstr "Ʈ-Ű  ޽ "
-
-#: src/prefs.c:300
-#, fuzzy
+msgstr "Ʈ-ͷ ޽ (_O)"
+
+#: src/prefs.c:523
 msgid "Window Closing"
-msgstr "â ũ"
-
-#: src/prefs.c:301
-#, fuzzy
+msgstr "â ݱ"
+
+#: src/prefs.c:524
 msgid "E_scape closes window"
-msgstr "Esc Ű  â "
-
-#: src/prefs.c:302
-#, fuzzy
+msgstr "E_sc Ű â "
+
+#: src/prefs.c:525
 msgid "Control-_W closes window"
-msgstr "Ʈ-W Ű  â "
-
-#: src/prefs.c:305
-#, fuzzy
+msgstr "Ʈ-_W Ű â "
+
+#: src/prefs.c:528
 msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr "Ʈ-{B/I/U/S}  HTL ± "
-
-#: src/prefs.c:306
-#, fuzzy
+msgstr "Ʈ-{B/I/U/S}Ű _HTML ± "
+
+#: src/prefs.c:529
 msgid "Control-(number) inserts _smileys"
-msgstr "Ʈ-() Ͽ ׸ "
-
-#: src/prefs.c:318
-#, fuzzy
+msgstr "Ʈ-()Ű ̸Ƽ (_S)"
+
+#: src/prefs.c:541
 msgid "Buttons"
-msgstr "Ʒ"
-
-#: src/prefs.c:319
-#, fuzzy
+msgstr ""
+
+#: src/prefs.c:542
 msgid "_Hide IM/Info/Chat buttons"
-msgstr "޽/ä//ڸ ư "
-
-#: src/prefs.c:320
-#, fuzzy
+msgstr "޽//ä  (_H)"
+
+#: src/prefs.c:543
 msgid "Show _pictures on buttons"
-msgstr "ư ׸ ֱ"
-
-#: src/prefs.c:322
-msgid "Buddy List Window"
-msgstr "ģâ"
-
-#: src/prefs.c:323
-#, fuzzy
+msgstr "߸ ׸(_P)"
+
+#: src/prefs.c:546
 msgid "_Save window size/position"
-msgstr "Ϻ â ġ ũ "
-
-#: src/prefs.c:324
-#, fuzzy
+msgstr "â ũ ġ (_S)"
+
+#: src/prefs.c:547
 msgid "_Raise window on events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:326
-#, fuzzy
+msgstr "޽  â ø(_R)"
+
+#: src/prefs.c:549
 msgid "Group Display"
-msgstr "׷ ǥ"
-
-#: src/prefs.c:327
-#, fuzzy
+msgstr "׷ ֱ"
+
+#: src/prefs.c:550
 msgid "Hide _groups with no online buddies"
-msgstr "ӵ ģ  ׷ "
-
-#: src/prefs.c:328
-#, fuzzy
+msgstr "ڰ  ׷ (_G)"
+
+#: src/prefs.c:551
 msgid "Show _numbers in groups"
-msgstr "׷쿡 ο ǥ"
-
-#: src/prefs.c:330
-#, fuzzy
+msgstr "׷쿡 ο ֱ(_N)"
+
+#: src/prefs.c:553
 msgid "Buddy Display"
-msgstr "ģ ǥ"
-
-#: src/prefs.c:331
-#, fuzzy
+msgstr "ģ ֱ"
+
+#: src/prefs.c:554
 msgid "Show buddy type _icons"
-msgstr "ģ  ׸ ֱ"
-
-#: src/prefs.c:332
-#, fuzzy
+msgstr "ģ   ֱ(_I)"
+
+#: src/prefs.c:555
 msgid "Show _warning levels"
-msgstr "  ǥ"
-
-#: src/prefs.c:333
-#, fuzzy
+msgstr "  ֱ(_W)"
+
+#: src/prefs.c:556
 msgid "Show idle _times"
-msgstr "  ð ֱ"
-
-#: src/prefs.c:334
-#, fuzzy
+msgstr "  ð ֱ(_T)"
+
+#: src/prefs.c:557
 msgid "Grey i_dle buddies"
-msgstr "ڸ ģ ȸ ǥϱ"
-
-#: src/prefs.c:351 src/prefs.c:393
-#, fuzzy
+msgstr "ڸ ģ ȸ(_D)"
+
+#: src/prefs.c:583
+msgid "_Placement:"
+msgstr "ġ(_P):"
+
+#: src/prefs.c:591
+msgid "Show IMs and chats in _same tabbed window."
+msgstr "޽ ä  ǿ (_S)"
+
+#: src/prefs.c:610 src/prefs.c:652
 msgid "Window"
-msgstr "޽ â"
-
-#: src/prefs.c:352 src/prefs.c:394
-#, fuzzy
+msgstr "â"
+
+#: src/prefs.c:611 src/prefs.c:653
 msgid "Show _buttons as:"
-msgstr "  ư Դϴ: "
-
-#: src/prefs.c:353 src/prefs.c:395
+msgstr "ó ߸ ֱ(_B): "
+
+#: src/prefs.c:612 src/prefs.c:654
 msgid "Pictures"
-msgstr "ܸ"
-
-#: src/prefs.c:354 src/prefs.c:396
+msgstr "׸"
+
+#: src/prefs.c:613 src/prefs.c:655
 msgid "Text"
-msgstr "ڸ"
-
-#: src/prefs.c:355 src/prefs.c:397
-#, fuzzy
+msgstr ""
+
+#: src/prefs.c:614 src/prefs.c:656
 msgid "Pictures and text"
-msgstr "ܰ "
-
-#: src/prefs.c:358 src/prefs.c:400
-#, fuzzy
+msgstr "׸ "
+
+#: src/prefs.c:617 src/prefs.c:659
 msgid "New window _width:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:359 src/prefs.c:401
-#, fuzzy
+msgstr " ȭâ (_W):"
+
+#: src/prefs.c:618 src/prefs.c:660
 msgid "New window _height:"
-msgstr " ȭâ  ũ"
-
-#: src/prefs.c:360 src/prefs.c:402
-#, fuzzy
+msgstr " ȭâ (_H):"
+
+#: src/prefs.c:619 src/prefs.c:661
 msgid "_Entry widget height:"
-msgstr "ȭ Է  "
-
-#: src/prefs.c:361 src/prefs.c:403
-#, fuzzy
+msgstr "ȭ Է  (_E):"
+
+#: src/prefs.c:620 src/prefs.c:662
 msgid "_Raise windows on events"
-msgstr "޽  ڵ â ø"
-
-#: src/prefs.c:362
-#, fuzzy
+msgstr "޽  ڵ â ø(_R)"
+
+#: src/prefs.c:621
 msgid "Hide window on _send"
-msgstr "޽   ڵ â ݱ"
-
-#: src/prefs.c:365
+msgstr "޽   â (_S)"
+
+#: src/prefs.c:624
 msgid "Buddy Icons"
 msgstr "ģ "
 
-#: src/prefs.c:366
-#, fuzzy
+#: src/prefs.c:625
 msgid "Hide buddy _icons"
-msgstr "ģ  "
-
-#: src/prefs.c:367
-#, fuzzy
+msgstr "ģ  (_I)"
+
+#: src/prefs.c:626
 msgid "Disable buddy icon a_nimation"
-msgstr "ִϸ̼ "
-
-#: src/prefs.c:370
-#, fuzzy
+msgstr "ִϸ̼  (_N)"
+
+#: src/prefs.c:629
 msgid "Show _logins in window"
-msgstr "â  ֱ"
-
-#: src/prefs.c:372
-#, fuzzy
+msgstr "â  ֱ(l)"
+
+#: src/prefs.c:631
 msgid "Typing Notification"
-msgstr "˾â  "
-
-#: src/prefs.c:373
-#, fuzzy
+msgstr "Ÿ ˸"
+
+#: src/prefs.c:632
 msgid "Notify buddies that you are _typing to them"
-msgstr " ģ Ÿ  ˸"
-
-#: src/prefs.c:405
+msgstr "ģ Ÿ  ˸(T)"
+
+#: src/prefs.c:664
 msgid "Tab Completion"
 msgstr "ڵϼ"
 
-#: src/prefs.c:406
-#, fuzzy
+#: src/prefs.c:665
 msgid "_Tab-complete nicks"
-msgstr " Ű  ڵϼϱ"
-
-#: src/prefs.c:407
-#, fuzzy
+msgstr " Ű  ڵϼ(_T)"
+
+#: src/prefs.c:666
 msgid "_Old-style tab completion"
-msgstr "  ڵϼϱ"
-
-#: src/prefs.c:410
-#, fuzzy
+msgstr "  ڵϼ(_O)"
+
+#: src/prefs.c:669
 msgid "_Show people joining/leaving in window"
-msgstr "ģ ϴ/° â "
-
-#: src/prefs.c:411
+msgstr "ϰų   â (_S)"
+
+#: src/prefs.c:670
 msgid "Co_lorize screennames"
-msgstr ""
-
-#: src/prefs.c:427
+msgstr " ִ ̵(_L)"
+
+#: src/prefs.c:687
 msgid "IM Tabs"
-msgstr ""
-
-#: src/prefs.c:428 src/prefs.c:438 src/prefs.c:451
-#, fuzzy
+msgstr "޽ "
+
+#: src/prefs.c:688 src/prefs.c:698 src/prefs.c:708
 msgid "Tab _placement:"
-msgstr " ġ"
-
-#: src/prefs.c:429 src/prefs.c:439 src/prefs.c:452
+msgstr " ġ(_P):"
+
+#: src/prefs.c:689 src/prefs.c:699 src/prefs.c:709
 msgid "Top"
 msgstr ""
 
-#: src/prefs.c:430 src/prefs.c:440 src/prefs.c:453
+#: src/prefs.c:690 src/prefs.c:700 src/prefs.c:710
 msgid "Bottom"
 msgstr "Ʒ"
 
-#: src/prefs.c:431 src/prefs.c:441
+#: src/prefs.c:691 src/prefs.c:701
 msgid "Left"
 msgstr ""
 
-#: src/prefs.c:432 src/prefs.c:442
+#: src/prefs.c:692 src/prefs.c:702
 msgid "Right"
 msgstr ""
 
-#: src/prefs.c:434
-#, fuzzy
+#: src/prefs.c:694
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
-msgstr " ä ϳ â  "
-
-#: src/prefs.c:435
-#, fuzzy
+msgstr " ޽ ȭ ϳ â (_I)"
+
+#: src/prefs.c:695
 msgid "Show a_liases in tabs/titles"
-msgstr " Ǵ   ֱ"
-
-#: src/prefs.c:437
-#, fuzzy
+msgstr "/  (_L)"
+
+#: src/prefs.c:697
 msgid "Chat Tabs"
-msgstr "ä"
-
-#: src/prefs.c:444
-#, fuzzy
+msgstr "ȭ "
+
+#: src/prefs.c:704
 msgid "Show all c_hats in one tabbed window"
-msgstr " ä ϳ â  "
-
-#: src/prefs.c:447
-msgid "Combined Tabs"
-msgstr ""
-
-#: src/prefs.c:448
-#, fuzzy
-msgid ""
-"Show IMs and chats in _same tabbed\n"
-"window."
-msgstr "äõ ȭ  â  "
-
-#: src/prefs.c:450
-#, fuzzy
+msgstr " ä ϳ â (_H)"
+
+#: src/prefs.c:707
 msgid "Buddy List Tabs"
-msgstr "ģ "
-
-#: src/prefs.c:471
+msgstr "ģ  "
+
+#: src/prefs.c:713
+msgid "Tab Options"
+msgstr " ɼ"
+
+#: src/prefs.c:714
+msgid "Show _close button on tabs."
+msgstr "ǿ ݱ ߸ ֱ(_C): "
+
+#: src/prefs.c:734
 msgid "Proxy Type"
 msgstr "Ͻ "
 
-#: src/prefs.c:472
-#, fuzzy
+#: src/prefs.c:735
 msgid "Proxy _type:"
-msgstr "Ͻ "
-
-#: src/prefs.c:473
-#, fuzzy
+msgstr "Ͻ (_T):"
+
+#: src/prefs.c:736
 msgid "No proxy"
 msgstr "Ͻ  "
 
-#: src/prefs.c:483
+#: src/prefs.c:746
 msgid "Proxy Server"
 msgstr "Ͻ "
 
-#: src/prefs.c:496
-#, fuzzy
+#: src/prefs.c:759
 msgid "_Host"
-msgstr "ȣƮ"
-
-#: src/prefs.c:510
+msgstr "ȣƮ(_H)"
+
+#: src/prefs.c:773
 msgid "Port"
 msgstr "Ʈ"
 
-#: src/prefs.c:526
-#, fuzzy
+#: src/prefs.c:789
 msgid "_User"
-msgstr ""
-
-#: src/prefs.c:540
-#, fuzzy
+msgstr "(_U)"
+
+#: src/prefs.c:803
 msgid "Pa_ssword"
-msgstr "н"
-
-#. Registered default browser is used by Windows
-#: src/prefs.c:577
+msgstr "йȣ(_S)"
+
+#: src/prefs.c:824
+#, c-format
+msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
+msgstr ""
+
+#: src/prefs.c:846
+msgid "Konqueror"
+msgstr ""
+
+#: src/prefs.c:847
+msgid "Opera"
+msgstr ""
+
+#: src/prefs.c:848
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:849
+msgid "Netscape"
+msgstr "ݽ"
+
+#: src/prefs.c:850
+msgid "Mozilla"
+msgstr ""
+
+#: src/prefs.c:858
+msgid "Manual"
+msgstr ""
+
+#: src/prefs.c:882
 msgid "Browser Selection"
-msgstr ""
-
-#: src/prefs.c:578
-#, fuzzy
+msgstr " "
+
+#: src/prefs.c:886
 msgid "_Browser"
-msgstr ""
-
-#: src/prefs.c:582
-msgid "Manual"
-msgstr ""
-
-#: src/prefs.c:606
-#, fuzzy
+msgstr "(_B)"
+
+#: src/prefs.c:894
+msgid "_Manual: "
+msgstr "(_M): "
+
+#: src/prefs.c:917
 msgid "Browser Options"
-msgstr "Ͻ ɼ"
-
-#: src/prefs.c:607
-#, fuzzy
+msgstr " ɼ"
+
+#: src/prefs.c:918
 msgid "Open new _window by default"
-msgstr "⺻  â "
-
-#: src/prefs.c:622
-#, fuzzy
+msgstr " â ⸦ ⺻ (_W)"
+
+#: src/prefs.c:932
 msgid "Message Logs"
-msgstr "޽"
-
-#: src/prefs.c:623
-#, fuzzy
+msgstr "޽ α"
+
+#: src/prefs.c:933
 msgid "_Log all instant messages"
-msgstr " ޽"
-
-#: src/prefs.c:624
-#, fuzzy
+msgstr " ޽ ȭ (_L)"
+
+#: src/prefs.c:934
 msgid "Log all c_hats"
-msgstr " ȭ "
-
-#: src/prefs.c:625
-#, fuzzy
+msgstr " ȭ (_H)"
+
+#: src/prefs.c:935
 msgid "Strip _HTML from logs"
-msgstr "HTML ±״  "
-
-#: src/prefs.c:627
-#, fuzzy
+msgstr "_HTML ±׸  "
+
+#: src/prefs.c:937
 msgid "System Logs"
-msgstr "ý α "
-
-#: src/prefs.c:628
-#, fuzzy
+msgstr "ý α"
+
+#: src/prefs.c:938
 msgid "Log when buddies _sign on/sign off"
-msgstr "ģ / "
-
-#: src/prefs.c:630
-#, fuzzy
+msgstr "ģ / (_S)"
+
+#: src/prefs.c:940
 msgid "Log when buddies become _idle/un-idle"
-msgstr "ģ / "
-
-#: src/prefs.c:632
-#, fuzzy
+msgstr "ģ / (_I)"
+
+#: src/prefs.c:942
 msgid "Log when buddies go away/come _back"
-msgstr "ڽ ڸ/ƿ "
-
-#: src/prefs.c:633
-#, fuzzy
+msgstr "ڽ ڸ/ƿ (_B)"
+
+#: src/prefs.c:943
 msgid "Log your _own signons/idleness/awayness"
-msgstr "ڽ //ڸ "
-
-#: src/prefs.c:635
-#, fuzzy
+msgstr "ڽ //ڸ (_O)"
+
+#: src/prefs.c:945
 msgid "I_ndividual log file for each buddy's signons"
-msgstr "ģ     α "
-
-#: src/prefs.c:667
+msgstr "ģ  α (_N)"
+
+#: src/prefs.c:978
 msgid "Sound Options"
 msgstr "Ҹ ɼ"
 
-#: src/prefs.c:668
-#, fuzzy
+#: src/prefs.c:979
 msgid "_No sounds when you log in"
-msgstr "ӽ Ҹ  "
-
-#: src/prefs.c:669
-#, fuzzy
+msgstr "ӽ Ҹ (_N)"
+
+#: src/prefs.c:980
 msgid "_Sounds while away"
-msgstr "ڸ Ҹ "
-
-#: src/prefs.c:672
-#, fuzzy
+msgstr "ڸ Ҹ (_S)"
+
+#: src/prefs.c:983
 msgid "Sound Method"
-msgstr "Ҹ  "
-
-#: src/prefs.c:673
+msgstr "Ҹ ǥ "
+
+#: src/prefs.c:984
 msgid "_Method"
-msgstr ""
-
-#: src/prefs.c:676
+msgstr "(_M)"
+
+#: src/prefs.c:987
 msgid "Console beep"
-msgstr ""
-
-#: src/prefs.c:686
-#, fuzzy
-msgid "Internal"
-msgstr " "
-
-#: src/prefs.c:687
+msgstr ""
+
+#: src/prefs.c:989
+msgid "Automatic"
+msgstr ""
+
+#: src/prefs.c:996
 msgid "Command"
-msgstr ""
-
-#: src/prefs.c:696
-#, fuzzy, c-format
+msgstr ""
+
+#: src/prefs.c:1005
+#, c-format
 msgid ""
 "Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
-"Ҹ  ɾ\n"
-"(%s  ̸)"
-
-#: src/prefs.c:732
-#, fuzzy
+"Ҹ  ɾ(_O)\n"
+"(%s()  ̸)"
+
+#: src/prefs.c:1043
 msgid "_Sending messages removes away status"
-msgstr "޽  ڸ ¿ "
-
-#: src/prefs.c:733
-#, fuzzy
+msgstr "޽  ڸ ¿ (_S)"
+
+#: src/prefs.c:1044
 msgid "_Queue new messages when away"
-msgstr "ڸ߿   ޽ "
-
-#: src/prefs.c:734
-#, fuzzy
+msgstr "ڸ ߿   ޽ (_Q)"
+
+#: src/prefs.c:1045
 msgid "_Ignore new conversations when away"
-msgstr "ڸ ο ȭ "
-
-#: src/prefs.c:736
-#, fuzzy
+msgstr "ڸ ο ȭ  (_I)"
+
+#: src/prefs.c:1047
 msgid "Auto-response"
-msgstr "ڵ 亯  "
-
-#: src/prefs.c:739
+msgstr "ڵ "
+
+#: src/prefs.c:1050
 msgid "Seconds before _resending:"
-msgstr ""
-
-#: src/prefs.c:741
-#, fuzzy
+msgstr " ð() ڿ (_R)"
+
+#: src/prefs.c:1052
 msgid "_Don't send auto-response"
-msgstr "ڵ 亯  "
-
-#: src/prefs.c:742
-#, fuzzy
+msgstr "ڵ  (_D)"
+
+#: src/prefs.c:1053
 msgid "_Only send auto-response when idle"
-msgstr "Խÿ ڵ 亯 "
-
-#: src/prefs.c:743
-#, fuzzy
+msgstr " ¿ ڵ (_O)"
+
+#: src/prefs.c:1054
 msgid "Do_n't send auto-response in active conversations"
-msgstr "ڵ 亯  "
-
-#: src/prefs.c:749
+msgstr "ȭ  ¿ ڵ  (_N)"
+
+#: src/prefs.c:1060
 msgid "Idle _time reporting:"
-msgstr ""
-
-#: src/prefs.c:750
+msgstr " ϱ(_T)"
+
+#: src/prefs.c:1061
 msgid "None"
 msgstr " "
 
-#: src/prefs.c:751
-#, fuzzy
+#: src/prefs.c:1062
 msgid "Gaim usage"
-msgstr "   ð ֱ"
-
-#: src/prefs.c:754
-#, fuzzy
+msgstr " "
+
+#: src/prefs.c:1065
 msgid "X usage"
-msgstr "X   ð ֱ"
-
-#: src/prefs.c:756
-#, fuzzy
+msgstr "X- "
+
+#: src/prefs.c:1067
 msgid "Windows usage"
-msgstr "â ũ"
-
-#: src/prefs.c:763
-#, fuzzy
+msgstr "â "
+
+#: src/prefs.c:1074
 msgid "Auto-away"
-msgstr "ڸ"
-
-#: src/prefs.c:764
+msgstr "ڵ ڸ"
+
+#: src/prefs.c:1075
 msgid "Set away _when idle"
-msgstr ""
-
-#: src/prefs.c:765
+msgstr " ½ ڸ ǥ(_W)"
+
+#: src/prefs.c:1076
 msgid "_Minutes before setting away:"
-msgstr ""
-
-#: src/prefs.c:770
-#, fuzzy
+msgstr " ð() Ŀ ڸ ǥ(_M):"
+
+#: src/prefs.c:1082
 msgid "Away m_essage:"
-msgstr "ڸ"
-
-#: src/prefs.c:804 src/prefs.c:892
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\" color=\"red\">%s</span>\n"
-"\n"
-"%s"
-msgstr ""
-
-#: src/prefs.c:808 src/prefs.c:896
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"%s"
-msgstr ""
-
-#: src/prefs.c:813
+msgstr "ڸ ޽(_E):"
+
+#: src/prefs.c:1126
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
 "\n"
 "<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">URL:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
-
-#: src/prefs.c:818
+"<span size=\"lager\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">:</span>\t%s\n"
+"<span weight=\"bold\"> Ʈ:</span>\t\t%s\n"
+"<span weight=\"bold\">ϸ:</span>\t%s"
+
+
+#: src/prefs.c:1131
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4133,107 +4925,116 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/prefs.c:1003
+#: src/prefs.c:1262
+msgid "Load"
+msgstr "ҷ"
+
+#: src/prefs.c:1269
+msgid "Name"
+msgstr "̸"
+
+#: src/prefs.c:1316
 msgid "Details"
-msgstr ""
-
-#: src/prefs.c:1108
+msgstr ""
+
+#: src/prefs.c:1414
 msgid "Gaim - Sound Configuration"
-msgstr " - Ҹ "
-
-#: src/prefs.c:1217
+msgstr "Gaim - Ҹ "
+
+#: src/prefs.c:1505
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1512
+msgid "Event"
+msgstr ""
+
+#: src/prefs.c:1528
 msgid "Test"
 msgstr "׽Ʈ"
 
-#: src/prefs.c:1225
+#: src/prefs.c:1536
 msgid "Choose..."
 msgstr ""
 
-#: src/prefs.c:1353
-#, fuzzy
+#: src/prefs.c:1664
 msgid "_Edit"
-msgstr ""
-
-#: src/prefs.c:1391
-#, fuzzy
+msgstr "ġ(_E)"
+
+#: src/prefs.c:1702
 msgid "Interface"
-msgstr "νϽ:"
-
-#: src/prefs.c:1392
-#, fuzzy
+msgstr "̽"
+
+#: src/prefs.c:1703
+msgid "Smiley Themes"
+msgstr "ϸ ׸"
+
+#: src/prefs.c:1704
 msgid "Fonts"
 msgstr "۲"
 
-#: src/prefs.c:1393
-#, fuzzy
+#: src/prefs.c:1705
 msgid "Message Text"
-msgstr "޽  "
-
-#: src/prefs.c:1394
+msgstr "޽ "
+
+#: src/prefs.c:1706
 msgid "Shortcuts"
-msgstr ""
-
-#: src/prefs.c:1396
-msgid "IM Window"
-msgstr "޽ â"
-
-#: src/prefs.c:1397
-#, fuzzy
-msgid "Chat Window"
-msgstr "׷ ä â"
-
-#: src/prefs.c:1398
+msgstr "Ű"
+
+#: src/prefs.c:1709
+msgid "IMs"
+msgstr "޽"
+
+#: src/prefs.c:1711
 msgid "Tabs"
-msgstr ""
-
-#: src/prefs.c:1399
+msgstr ""
+
+#: src/prefs.c:1712
 msgid "Proxy"
 msgstr "Ͻ"
 
-#: src/prefs.c:1400
+#. We use the registered default browser in windows
+#: src/prefs.c:1715
 msgid "Browser"
 msgstr ""
 
-#: src/prefs.c:1402
+#: src/prefs.c:1717
 msgid "Logging"
 msgstr ""
 
-#: src/prefs.c:1403
+#: src/prefs.c:1718
 msgid "Sounds"
 msgstr "Ҹ"
 
-#: src/prefs.c:1404
-#, fuzzy
+#: src/prefs.c:1719
 msgid "Sound Events"
 msgstr "Ҹ"
 
-#: src/prefs.c:1405
-#, fuzzy
+#: src/prefs.c:1720
 msgid "Away / Idle"
-msgstr "ڸ : "
-
-#: src/prefs.c:1406
+msgstr "ڸ / "
+
+#: src/prefs.c:1721
 msgid "Away Messages"
 msgstr "ڸ"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1723
 msgid "Plugins"
 msgstr "÷"
 
-#: src/prefs.c:1447
+#: src/prefs.c:1762
 msgid "Gaim - Preferences"
-msgstr " - ȯ漳"
-
-#: src/prefs.c:1565
-#, fuzzy
+msgstr "Gaim - ⺻ "
+
+#: src/prefs.c:1880
 msgid "Gaim - Debug Window"
-msgstr " â"
-
-#: src/prpl.c:100
-msgid "ICQ Protocol detected."
-msgstr ""
+msgstr "Gaim -  â"
 
 #: src/prpl.c:101
+msgid "ICQ Protocol detected."
+msgstr ""
+
+#: src/prpl.c:102
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -4241,28 +5042,49 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:252
+#: src/prpl.c:283
 msgid "Gaim - Prompt"
-msgstr " - "
-
-#: src/prpl.c:453
+msgstr "Gaim - "
+
+#: src/prpl.c:357
+msgid "No actions available"
+msgstr " ൿ "
+
+#: src/prpl.c:482
+#, fuzzy, c-format
+msgid "%s has mail from %s: %s"
+msgstr "%sκ  Ǿϴ: %s"
+
+#: src/prpl.c:482
 msgid "No Subject"
-msgstr ""
-
-#: src/prpl.c:474
+msgstr " "
+
+#: src/prpl.c:484
+#, c-format
+msgid "%s has new mail."
+msgstr ""
+
+#: src/prpl.c:487
+#, fuzzy, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "<i>ڸ ޽ </i>"
+msgstr[1] "<i>ڸ ޽ </i>"
+
+#: src/prpl.c:503
 msgid "Gaim - New Mail"
-msgstr " -  "
-
-#: src/prpl.c:500
+msgstr "Gaim -  "
+
+#: src/prpl.c:529
 msgid "Open Mail"
 msgstr " "
 
-#: src/prpl.c:626
+#: src/prpl.c:662
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s %s ģ Ͽ ߰ ߽ϴ%s%s%s"
-
-#: src/prpl.c:634
+msgstr "%s%s%s%s %s ģ Ͽ ߽ϴ%s%s%s"
+
+#: src/prpl.c:670
 msgid ""
 "\n"
 "\n"
@@ -4270,609 +5092,197 @@
 msgstr ""
 "\n"
 "\n"
-" ģ Ͽ ߰ұ?"
-
-#: src/prpl.c:677
+" ģ Ͽ ұ?"
+
+#: src/prpl.c:672
+msgid "Gaim - Information"
+msgstr "Gaim - "
+
+#: src/prpl.c:674
+msgid "Gaim - Confirm"
+msgstr "Gaim - "
+
+#: src/prpl.c:713
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "     ִ  ϴ."
 
-#: src/prpl.c:714
+#: src/prpl.c:750
 msgid "Gaim - Registration"
-msgstr " - "
-
-#: src/prpl.c:728
+msgstr "Gaim - "
+
+#: src/prpl.c:764
 msgid "Registration Information"
 msgstr " "
 
-#: src/prpl.c:745
+#: src/prpl.c:781
 msgid "Register"
 msgstr ""
 
-#: src/server.c:56
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "йȣ Էϼ"
 
-#: src/server.c:648
+#: src/server.c:701
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d ޽)"
 
-#: src/server.c:654
+#: src/server.c:713
 msgid "(1 message)"
 msgstr "(1 ޽)"
 
-#: src/server.c:966
-msgid "Yes"
-msgstr "Ȯ"
-
-#: src/server.c:967
-msgid "No"
-msgstr ""
-
-#: src/server.c:1163
+#: src/server.c:937
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+
+#: src/server.c:940
+msgid "an anonymous person"
+msgstr "͸ "
+
+#: src/server.c:1020
+#, c-format
+msgid ""
+"User '%s' invites %s to buddy chat room: '%s'\n"
+"%s"
+msgstr ""
+
+#: src/server.c:1024
+#, c-format
+msgid "User '%s' invites %s to buddy chat room: '%s'\n"
+msgstr ""
+
+#: src/server.c:1030
+msgid "Buddy Chat Invite"
+msgstr "ģ ä ʴ"
+
+#: src/server.c:1222
 msgid "More Info"
 msgstr " "
 
-#: src/sound.c:68
+#: src/sound.c:78
 msgid "Buddy logs in"
 msgstr "ģ  "
 
-#: src/sound.c:69
+#: src/sound.c:79
 msgid "Buddy logs out"
 msgstr "ģ   "
 
-#: src/sound.c:70
+#: src/sound.c:80
 msgid "Message received"
 msgstr "޽ ޾ "
 
-#: src/sound.c:71
+#: src/sound.c:81
 msgid "Message received begins conversation"
 msgstr "޽ ޾ ȭ ۵ "
 
-#: src/sound.c:72
+#: src/sound.c:82
 msgid "Message sent"
 msgstr "޽  "
 
-#: src/sound.c:73
+#: src/sound.c:83
 msgid "Person enters chat"
 msgstr "ȭ濡 մ  "
 
-#: src/sound.c:74
+#: src/sound.c:84
 msgid "Person leaves chat"
 msgstr "ȭ濡 մ  "
 
-#: src/sound.c:75
+#: src/sound.c:85
 msgid "You talk in chat"
 msgstr "ȭ濡 ڽ  "
 
-#: src/sound.c:76
+#: src/sound.c:86
 msgid "Others talk in chat"
 msgstr "ȭ濡 ٸ  "
 
-#: src/sound.c:79
+#: src/sound.c:89
 msgid "Someone says your name in chat"
 msgstr "ȭ濡   ̸  "
 
-#~ msgid "Gadu-Gadu Error"
-#~ msgstr "- "
-
-#~ msgid "Gadu-Gadu Information"
-#~ msgstr "- "
-
-#~ msgid "Couldn't send http request"
-#~ msgstr "http û   ϴ."
-
-#~ msgid "Buddies List import from Server failed (%s)"
-#~ msgstr " ģ    (%s)"
-
-#~ msgid "Buddies List export to Server failed (%s)"
-#~ msgstr "ģ     (%s)"
-
-#~ msgid "Deletion of Buddies List from Server failed (%s)"
-#~ msgstr " ģ    (%s)"
-
-#~ msgid "Connect to search service failed (%s)"
-#~ msgstr "˻ 񽺿   (%s)"
-
-#~ msgid "Changing Password failed (%s)"
-#~ msgstr "йȣ   (%s)"
-
-#~ msgid ""
-#~ "%s has requested a DCC chat.  Would you like to establish the direct "
-#~ "connection?"
-#~ msgstr "%s DCC ä û߽ϴ.  ޾Ƶ̽ðڽϱ?"
-
-#~ msgid "Incorrect current password! Password NOT Changed!"
-#~ msgstr " йȣ Ʋϴ! йȣ  ʾҽϴ."
-
-#~ msgid "Password Change Error!"
-#~ msgstr "йȣ  !"
-
-#~ msgid "New password same as old password! Password NOT Changed!"
-#~ msgstr " йȣ  йȣ մϴ!  ʾҽϴ."
-
-#~ msgid "Password Change"
-#~ msgstr "йȣ "
-
-#~ msgid "Invalid Jabber I.D."
-#~ msgstr "߸  ̵"
-
-#~ msgid "MSN Error"
-#~ msgstr "MSN "
-
-#~ msgid "Chat Error!"
-#~ msgstr "ä !"
-
-#~ msgid "Gaim - Chat"
-#~ msgstr " - ä"
-
-#~ msgid "Gaim - ICQ Authorization Granted"
-#~ msgstr " - ICQ  ޾Ƶ鿩"
-
-#~ msgid "You missed %d messages from %s because they are too evil."
-#~ msgstr ""
-#~ "%d %s  ޽  ܾ ϰ ־   ϴ."
-
-#~ msgid "Gaim - Error"
-#~ msgstr " - "
-
-#~ msgid "Gaim - Oscar SNAC Error"
-#~ msgstr " - ī SNAC "
-
-#~ msgid "Reason unknown"
-#~ msgstr "   "
-
-#~ msgid "Error"
-#~ msgstr ""
-
-#~ msgid "Gaim - Warning"
-#~ msgstr " - "
-
-#~ msgid ""
-#~ "You have selected to open a Direct IM connection with %s. Doing this will "
-#~ "let them see your IP address, and may be a security risk. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "%s԰   ߽ϴ.      "
-#~ " IP ּҸ   , ̴ Ȼ    ֽϴ. ׷ "
-#~ " ұ?"
-
-#~ msgid "TOC Resume"
-#~ msgstr "TOC ٽ "
-
-#~ msgid "Chat Error"
-#~ msgstr "ä "
-
-#~ msgid "TOC Pause"
-#~ msgstr "TOC Ͻ"
-
-#~ msgid "Could not write file header!"
-#~ msgstr "    ϴ!"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: #gaim on irc.openprojects.net"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "IRC: irc.openprojects.net  #gaim ä"
-
-#~ msgid ""
-#~ "Active Developers\n"
-#~ "====================\n"
-#~ "Rob Flynn (maintainer) [ rob@marko.net ]\n"
-#~ "Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
-#~ "\n"
-#~ "Crazy Patch Writers\n"
-#~ "===================\n"
-#~ "Benjamin Miller\n"
-#~ "Decklin Foster\n"
-#~ "Nathan Walp\n"
-#~ "Mark Doliner\n"
-#~ "\n"
-#~ "Retired Developers\n"
-#~ "===================\n"
-#~ "Jim Duchek\n"
-#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-#~ "Mark Spencer (original author)   [ markster@marko.net ]"
-#~ msgstr ""
-#~ " ۾ \n"
-#~ "====================\n"
-#~ "Rob Flynn (̳) [ rob@marko.net ]\n"
-#~ "Sean Egan (ڴ)      [ bj91704@binghamton.edu ]\n"
-#~ "\n"
-#~ "ũ ġ \n"
-#~ "===================\n"
-#~ "Benjamin Miller\n"
-#~ "Decklin Foster\n"
-#~ "Nathan Walp\n"
-#~ "Mark Doliner\n"
-#~ "\n"
-#~ " \n"
-#~ "===================\n"
-#~ "Jim Duchek\n"
-#~ "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
-#~ "Mark Spencer ( )   [ markster@marko.net ]"
-
-#~ msgid "Web Site"
-#~ msgstr "Ʈ"
-
-#~ msgid "Password: "
-#~ msgstr "йȣ: "
-
-#~ msgid "About"
-#~ msgstr "... Ͽ"
-
-#~ msgid "Attempting to sign on...."
-#~ msgstr " õմϴ...."
-
-#~ msgid "Offline. Click to bring up login box."
-#~ msgstr "ӵǾ  ʽϴ. Ŭϸ α ȭ ɴϴ."
-
-#~ msgid "Away: %d pending."
-#~ msgstr "ڸ: %d "
-
-#~ msgid "Away."
-#~ msgstr "ڸ"
-
-#~ msgid "Can't create Gaim applet!"
-#~ msgstr " ø   ϴ!"
-
-#~ msgid "About..."
-#~ msgstr "... Ͽ"
-
-#~ msgid "Perl"
-#~ msgstr "(ũƮ)"
-
-#~ msgid "Load Script"
-#~ msgstr " ũƮ "
-
-#~ msgid "Unload All Scripts"
-#~ msgstr "ũƮ  "
-
-#~ msgid "List Scripts"
-#~ msgstr " ũƮ"
-
-#~ msgid "Whisper"
-#~ msgstr "ӼӸ"
-
-#~ msgid "Gaim - Save Conversation"
-#~ msgstr " - ȭ "
-
-#~ msgid "Message Error"
-#~ msgstr "޽ "
-
-#~ msgid "Unable to send message: Unknown reason"
-#~ msgstr "޽   ϴ :    "
-
-#~ msgid "Currently at %d, "
-#~ msgstr " %d, "
-
-#~ msgid "Setting position to %d\n"
-#~ msgstr "%d ġ űϴ\n"
-
-#~ msgid "Bold Text"
-#~ msgstr "β ۾"
-
-#~ msgid "Italics Text"
-#~ msgstr " ۾"
-
-#~ msgid "Underline Text"
-#~ msgstr " ģ ۾"
-
-#~ msgid "Strike"
-#~ msgstr ""
-
-#~ msgid "Decrease font size"
-#~ msgstr " ũ ̱"
-
-#~ msgid "Small"
-#~ msgstr "۰"
-
-#~ msgid "Normal font size"
-#~ msgstr " ũ "
-
-#~ msgid "Normal"
-#~ msgstr ""
-
-#~ msgid "Increase font size"
-#~ msgstr " ũ Ű"
-
-#~ msgid "Big"
-#~ msgstr "ũ"
-
-#~ msgid "Link"
-#~ msgstr "ũ"
-
-#~ msgid "Insert smiley face"
-#~ msgstr "ϸ  "
-
-#~ msgid "Smiley"
-#~ msgstr "ϸ"
-
-#~ msgid "Image"
-#~ msgstr "׸"
-
-#~ msgid "Sound"
-#~ msgstr "Ҹ"
-
-#~ msgid "Gaim - Warn user?"
-#~ msgstr " - ڿ  "
-
-#~ msgid "Do you really want to warn %s?"
-#~ msgstr " %sԿ  ?"
-
-#~ msgid "Gaim - Remove %s?"
-#~ msgstr " - %s Ͽ "
-
-#~ msgid "Remove Buddy"
-#~ msgstr "ģ "
-
-#~ msgid ""
-#~ "You are about to remove '%s' from\n"
-#~ "your buddy list. Do you want to continue?"
-#~ msgstr ""
-#~ " ģ Ͽ '%s'\n"
-#~ "ұ?"
-
-#~ msgid "Gaim - IM user"
-#~ msgstr " - ޽ "
-
-#~ msgid "IM who:"
-#~ msgstr " ģ"
-
-#~ msgid "User:"
-#~ msgstr ":"
-
-#~ msgid "Gaim - Get User Info"
-#~ msgstr " -   "
-
-#~ msgid "Add Group"
-#~ msgstr "׷ ߰"
-
-#~ msgid "Add Buddy"
-#~ msgstr "ģ ߰"
-
-#~ msgid "Contact"
-#~ msgstr "̵"
-
-#~ msgid "Buddy Pounce Error"
-#~ msgstr "ģ˸ "
-
-#~ msgid "Gaim - Change Password Error"
-#~ msgstr " - йȣ  "
-
-#~ msgid "Alias Buddy"
-#~ msgstr "ģ  "
-
-#~ msgid "Unable to remove file %s - %s"
-#~ msgstr "%s    ϴ. - %s"
-
-#~ msgid "Rename Group"
-#~ msgstr "׷ ̸ "
-
-#~ msgid "Preferences Error"
-#~ msgstr "ȯ漳 "
-
-#~ msgid "Plugin Error"
-#~ msgstr "÷ "
-
-#~ msgid "Login Error"
-#~ msgstr "α "
-
-#~ msgid "Select All"
-#~ msgstr " "
-
-#~ msgid "Select Autos"
-#~ msgstr "ڵ "
-
-#~ msgid "Select None"
-#~ msgstr " "
-
-#~ msgid "Sign On/Off"
-#~ msgstr "/"
-
-#~ msgid "Perl Scripts"
-#~ msgstr " ũƮ"
-
-#~ msgid "Gaim - Plugin List"
-#~ msgstr " - ÷ "
-
-#~ msgid "Gaim - Plugins"
-#~ msgstr " - ÷ "
-
-#~ msgid "Loaded Plugins"
-#~ msgstr "÷"
-
-#~ msgid "Filepath:"
-#~ msgstr " :"
-
-#~ msgid "Load"
-#~ msgstr "ҷ"
-
-#~ msgid "Load a plugin from a file"
-#~ msgstr "Ͽ ÷ ҷ"
-
-#~ msgid "Configure"
-#~ msgstr ""
-
-#~ msgid "Configure settings of the selected plugin"
-#~ msgstr "õ ÷ "
-
-#~ msgid "Reload"
-#~ msgstr "ٽ б"
-
-#~ msgid "Reload the selected plugin"
-#~ msgstr " ÷ ٽ ϱ"
-
-#~ msgid "Unload"
-#~ msgstr ""
-
-#~ msgid "Unload the selected plugin"
-#~ msgstr "õ ÷ "
-
-#~ msgid "Close this window"
-#~ msgstr "â ݱ"
-
-#~ msgid "All options take effect immediately unless otherwise noted."
-#~ msgstr "ٸ    ɼ   ˴ϴ."
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Ÿ "
-
-#~ msgid "Use borderless buttons"
-#~ msgstr "׵θ ư "
-
-#~ msgid "Show Buddy Ticker"
-#~ msgstr "ģ ã â "
-
-#~ msgid "Report Idle Times"
-#~ msgstr "  ð ֱ"
-
-#~ msgid "Konqueror"
-#~ msgstr ""
-
-#~ msgid "Opera"
-#~ msgstr ""
-
-#~ msgid "Netscape"
-#~ msgstr "ݽ"
-
-#~ msgid "Mozilla"
-#~ msgstr ""
-
-#~ msgid "GNOME URL Handler"
-#~ msgstr "׳ URL ó"
-
-#~ msgid "Galeon"
-#~ msgstr ""
-
-#~ msgid "Manual (%s for URL)"
-#~ msgstr " (%s URL)"
-
-#~ msgid ""
-#~ "Not all protocols can use these proxy options. Please see the README file "
-#~ "for details."
-#~ msgstr ""
-#~ "Ͻø     ֽϴ. ڼ  ϸ README "
-#~ " оʽÿ."
-
-#~ msgid "SOCKS 4"
-#~ msgstr "SOCKS v4 Ͻ"
-
-#~ msgid "SOCKS 5"
-#~ msgstr "SOCKS v5 Ͻ"
-
-#~ msgid "HTTP"
-#~ msgstr "HTTP Ͻ"
-
-#~ msgid "Buddy List Options"
-#~ msgstr "ģ ɼ"
-
-#~ msgid "Automatically show buddy list on sign on"
-#~ msgstr "α׿   ģ ڵ "
-
-#~ msgid "Display Buddy List near applet"
-#~ msgstr "ģ ø αٿ ǥ"
-
-#~ msgid "Raise Buddy List on Signons and Signoffs"
-#~ msgstr "ģ /  ģ â ø"
-
-#~ msgid "Conversation Options"
-#~ msgstr "ȭ ɼ"
-
-#~ msgid "Keyboard Options"
-#~ msgstr "Ű ɼ"
-
-#~ msgid "F2 toggles timestamp display"
-#~ msgstr "Ÿӽ  ϱ  F2 "
-
-#~ msgid "Display and General Options"
-#~ msgstr "ȭǥ  Ϲ ɼ"
-
-#~ msgid "Ignore TiK Automated Messages"
-#~ msgstr "TiK ڵȭ ޽ "
-
-#~ msgid "IM Options"
-#~ msgstr "޽ ɼ"
-
-#~ msgid "Tab Placement"
-#~ msgstr " ġ"
-
-#~ msgid "Chat Options"
-#~ msgstr "ä ɼ"
-
-#~ msgid "Show conversations in the same tabbed window"
-#~ msgstr "ȭ äð  â  "
-
-#~ msgid "Italic Text"
-#~ msgstr " ۾"
-
-#~ msgid "Select"
-#~ msgstr ""
-
-#~ msgid "Font Face for Text"
-#~ msgstr "ؽƮ  ۲"
-
-#~ msgid "Font Size for Text"
-#~ msgstr "ؽƮ   ũ"
-
-#~ msgid "Sound played when:"
-#~ msgstr "  Ҹ :"
-
-#~ msgid "Time between sending auto-responses (in seconds):"
-#~ msgstr " ð   ڵ 亯( ):"
-
-#~ msgid "Auto Away after"
-#~ msgstr " "
-
-#~ msgid "minutes using"
-#~ msgstr "     ڸ ޽ : "
-
-#~ msgid "Make Away"
-#~ msgstr " ڸ"
-
-#~ msgid "Privacy Options"
-#~ msgstr "̹ ɼ"
-
-#~ msgid "Allow List"
-#~ msgstr " "
-
-#~ msgid "Block List"
-#~ msgstr " "
-
-#~ msgid "Gaim debug output window"
-#~ msgstr "   â"
-
-#~ msgid "General"
-#~ msgstr "Ϲ"
-
-#~ msgid "Conversations"
-#~ msgstr "ȭ"
-
-#~ msgid ""
-#~ "You have attempted to load a protocol which was not compiled from the "
-#~ "same version of the source as this application was. Unfortunately, "
-#~ "because it is not the same version I cannot safely tell you which one it "
-#~ "was. Needless to say, it was not successfully loaded."
-#~ msgstr ""
-#~ "  ҽ ϵ   εϷ õ߽ϴ. "
-#~ " ε  ϴ."
-
-#~ msgid "Protocol Error"
-#~ msgstr " "
-
-#~ msgid "%s was using %s, which got removed. %s is now offline."
-#~ msgstr "%s  %s ߽ϴ. %s  Դϴ."
-
-#~ msgid "Disconnect"
-#~ msgstr ""
-
-#~ msgid "Accept?"
-#~ msgstr "޾Ƶϱ?"
-
-#~ msgid "Warned"
-#~ msgstr ""
+#: src/sound.c:180
+#, c-format
+msgid "Unable to play sound because the chosen filename (%s) does not exist."
+msgstr ""
+
+#: src/sound.c:192
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr ""
+
+#: src/sound.c:199
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr ""
+
+#: src/util.c:970
+msgid "Not connected to AIM"
+msgstr "AIM  "
+
+#: src/util.c:979 src/util.c:1018
+msgid "No screenname given."
+msgstr "̵ Է ʾҽϴ"
+
+#: src/util.c:1054
+msgid "No roomname given."
+msgstr "̸ Է ʾҽϴ."
+
+#: src/util.c:1070
+msgid "Invalid AIM URI"
+msgstr "߸ AIM URI"
+
+#. * Custom away message.
+#: src/prpl.h:160
+msgid "Custom"
+msgstr ""
+
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr ""
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr ""
+
+#. 
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: src/win32/systray.c:19
+msgid "Gaim Instant Messenger"
+msgstr " νƮ ޽"
+
+#: src/win32/systray.c:20
+msgid "Gaim Instant Messenger - Signed off"
+msgstr " νƮ ޽ -  ȵ"
+
+#: src/win32/systray.c:21
+msgid "Gaim Instant Messenger - Away"
+msgstr " νƮ ޽ - ڸ"
+
+#: src/win32/systray.c:103
+msgid "New"
+msgstr ""
+
+#: src/win32/systray.c:127
+msgid "Set Away Message"
+msgstr "ڸ ޽ "
+
+#: src/win32/systray.c:134
+msgid "I'm Back"
+msgstr "ƿ"
+
+#: src/win32/systray.c:303
+msgid "Preferences"
+msgstr "⺻ "
+
+#: src/win32/systray.c:309
+msgid "Exit"
+msgstr ""
+