# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1067349978 0
# Node ID db2c51ef0c54e872d18aae4b69d884ae3b4ec398
# Parent  94d7e24080a8bad2b8f2555d3b079ef9d528905d
[gaim-migrate @ 7953]
Kyung-uk updated ko.po

committer: Tailor Script <tailor@pidgin.im>

diff -r 94d7e24080a8 -r db2c51ef0c54 ChangeLog
--- a/ChangeLog	Tue Oct 28 14:04:06 2003 +0000
+++ b/ChangeLog	Tue Oct 28 14:06:18 2003 +0000
@@ -24,6 +24,7 @@
 	* French translation updated (Eric Boumaour)
 	* German translation updated (Bjoern Voigt)
 	* Italian translation updated (Claudio Satriano)
+	* Korean translation updated (Kyung-uk)
 	* Portuguese (Portugal) added (Duarte Henriques)
 	* Swedish translation updated (Tore Lundqvist (luntor))
 
diff -r 94d7e24080a8 -r db2c51ef0c54 gaim.desktop
--- a/gaim.desktop	Tue Oct 28 14:04:06 2003 +0000
+++ b/gaim.desktop	Tue Oct 28 14:06:18 2003 +0000
@@ -6,7 +6,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]=멀티 프로토콜 인스턴트 메시징 클라이언트
+Comment[ko]=다중 프로토콜 메신저
 Exec=gaim
 Icon=gaim.png
 Terminal=false
diff -r 94d7e24080a8 -r db2c51ef0c54 po/ko.po
--- a/po/ko.po	Tue Oct 28 14:04:06 2003 +0000
+++ b/po/ko.po	Tue Oct 28 14:06:18 2003 +0000
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.65cvs\n"
-"POT-Creation-Date: 2003-10-09 15:23-0700\n"
-"PO-Revision-Date: 2003-09-01 14:29+0900\n"
+"Project-Id-Version: gaim 0.72cvs\n"
+"POT-Creation-Date: 2003-09-03 00:10+0900\n"
+"PO-Revision-Date: 2003-10-17 21:23+0900\n"
 "Last-Translator: Son, Kyung-uk <vvs740@chol.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:105
+#: plugins/autorecon.c:104
 msgid "Auto-Reconnect"
 msgstr "�ڵ����� �ٽ� ����"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:108 plugins/autorecon.c:110
+#: plugins/autorecon.c:107 plugins/autorecon.c:109
 msgid "When you are kicked offline, this reconnects you."
 msgstr "������ ����� �ٽ� �����մϴ�."
 
@@ -57,23 +57,22 @@
 #.
 #: plugins/docklet/docklet-win32.c:44
 msgid "Gaim"
-msgstr "����"
+msgstr "����"
 
 #: plugins/docklet/docklet-win32.c:45
 msgid "Gaim - Signed off"
-msgstr "���� - ���� ����"
+msgstr "���� - ���� ����"
 
 #: plugins/docklet/docklet-win32.c:46
 msgid "Gaim - Away"
-msgstr "���� - �ڸ����"
-
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1765
+msgstr "���� - �ڸ����"
+
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:441 src/gtkaccount.c:1612
 msgid "Auto-login"
 msgstr "�ڵ� �α���"
 
 #: plugins/docklet/docklet.c:117
-#, fuzzy
-msgid "New Message..."
+msgid "New Message.."
 msgstr "�� �޽���.."
 
 #: plugins/docklet/docklet.c:118
@@ -84,16 +83,16 @@
 msgid "New..."
 msgstr "��..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
-#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
-#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6064
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1607 src/gtkpounce.c:461
+#: src/gtkprefs.c:1507 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3439
+#: src/protocols/jabber/jabber.c:3493 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5875
 msgid "Away"
 msgstr "�ڸ����"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:513
 msgid "Back"
 msgstr "���ƿ�"
 
@@ -106,11 +105,11 @@
 msgstr "���� ����"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1924 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1765 src/main.c:315
 msgid "Accounts"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2361 src/main.c:325
 msgid "Preferences"
 msgstr "�⺻ ����"
 
@@ -122,11 +121,11 @@
 msgid "Quit"
 msgstr "������"
 
-#: plugins/docklet/docklet.c:478
+#: plugins/docklet/docklet.c:482
 msgid "Tray Icon Configuration"
 msgstr "Ʈ���� ������ ����"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:486
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "Ʈ���� �������� Ŭ���DZ� �������� �� �޽��� ����(_H)"
 
@@ -137,26 +136,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:506
+#: plugins/docklet/docklet.c:510
 msgid "System Tray Icon"
 msgstr "�ý��� Ʈ���� ������"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:513
 msgid "Displays an icon for Gaim in the system tray."
 msgstr ""
 
 #. *  description
-#: plugins/docklet/docklet.c:511
+#: plugins/docklet/docklet.c:515
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
 "and to toggle display of the buddy list or login window. Also allows "
 "messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
-"������ ���� ���¸� Ʈ���� ������(���� ��� GNOME�̳� KDE, ������ ���)���� "
+"������ ���� ���¸� Ʈ���� ������(���� ��� GNOME�̳� KDE, ������ ���)���� "
 "�����ְ�, �Ϲ������� ���Ǵ� �Լ��� ������ �����ϰ� �ϸ�, ģ�� ����̳� �α�"
 "��â�� ����� �� �ְ� �մϴ�. �� ICQó�� �������� Ŭ���� ������ �����ϴ� �޽�"
 "���� �׾Ƴ��� �� �ֽ��ϴ�."
@@ -170,7 +169,7 @@
 #. *< id
 #: plugins/filectl.c:201
 msgid "Gaim File Control"
-msgstr "���� ���� ��Ʈ��"
+msgstr "���� ���� ��Ʈ��"
 
 #. *< name
 #. *< version
@@ -211,7 +210,7 @@
 #. *  summary
 #: plugins/gaim-remote/remote.c:717
 msgid "Provides remote control for gaim applications."
-msgstr "���� ���α׷��� ���� �������� �����մϴ�."
+msgstr "���� ���α׷��� ���� �������� �����մϴ�."
 
 #. *  description
 #: plugins/gaim-remote/remote.c:719
@@ -219,7 +218,7 @@
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
 msgstr ""
-"�����Ƽ ���α׷��̳� ���� ���� ������ �̿��� ������ ���������� �� �ְ� �մ�"
+"�����Ƽ ���α׷��̳� ���� ���� ������ �̿��� ������ ���������� �� �ְ� �մ�"
 "��."
 
 #. *< api_version
@@ -231,7 +230,7 @@
 #. *< id
 #: plugins/gaiminc.c:81
 msgid "Gaim Demonstration Plugin"
-msgstr "���� �÷����� �ÿ�"
+msgstr "���� �÷����� �ÿ�"
 
 #. *< name
 #. *< version
@@ -325,15 +324,15 @@
 msgid "Change"
 msgstr "�ٲٱ�"
 
-#: plugins/history.c:98
+#: plugins/history.c:90
 msgid "History"
 msgstr "��ȭ ����"
 
-#: plugins/history.c:100
+#: plugins/history.c:92
 msgid "Shows recently logged conversations in new conversations."
 msgstr "�� ��ȭ ����� ���� ����� ���Դϴ�."
 
-#: plugins/history.c:101
+#: plugins/history.c:93
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
@@ -387,55 +386,6 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "�������� ���� �󸶳� ������� �ʾҴ��� ���� �� �ְ� �մϴ�."
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-client.c:84
-msgid "IPC Test Client"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-client.c:87
-msgid "Test plugin IPC support, as a client."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-client.c:89
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-server.c:71
-#, fuzzy
-msgid "IPC Test Server"
-msgstr "���� ����"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-server.c:74
-msgid "Test plugin IPC support, as a server."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-server.c:76
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
 msgstr "���� �˻��"
@@ -445,77 +395,60 @@
 msgstr "�� ���� ������ �ִ��� �˻��մϴ�."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:707
 msgid "Notify For"
 msgstr "���� ��� �˸�"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:711
 msgid "_IM windows"
 msgstr "�޽��� â(_I)"
 
-#: plugins/notify.c:583
-#, fuzzy
-msgid "C_hat windows"
-msgstr "ä�� â(_C)"
-
-#: plugins/notify.c:590
-#, fuzzy
-msgid "_Focused windows"
-msgstr "�޽��� â(_I)"
+#: plugins/notify.c:716
+msgid "_Chat windows"
+msgstr "��ȭ â(_C)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:722
 msgid "Notification Methods"
 msgstr "�˸� ���"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:728
 msgid "Prepend _string into window title:"
 msgstr "â �����ٿ� �� ���ڿ�(_S):"
 
-#. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:739
+msgid "_Quote window title"
+msgstr "â ���� �ο�(_Q)"
+
+#: plugins/notify.c:744
+msgid "Set Window Manager \"_URGENT\" Hint"
+msgstr "â ������ \"���(_U)\" ��Ʈ ����"
+
+#: plugins/notify.c:749
 msgid "Insert c_ount of new messages into window title"
 msgstr "â ���� ���� �� �޽��� ���� ����(_O)"
 
-#. Urgent method button
-#: plugins/notify.c:633
-#, fuzzy
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "������Ŵ��� \"_URGENT\" ��Ʈ ���"
-
-#. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:754
+msgid "_Notify even if conversation is in focus"
+msgstr "��ȭ�� Ȱ��ȭ �Ǹ� �˸�(_N)"
+
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:760
 msgid "Notification Removal"
-msgstr "�˸� ���ֱ�"
-
-#. Remove on focus button
-#: plugins/notify.c:646
-#, fuzzy
-msgid "Remove when conversation window _gains focus"
-msgstr "��ȭ â�� Ȱ��ȭ �Ǹ� ����(_F)"
-
-#. Remove on click button
-#: plugins/notify.c:654
+msgstr "�˸� ����"
+
+#: plugins/notify.c:764
+msgid "Remove when conversation window gains _focus"
+msgstr "��ȭâ�� Ȱ��ȭ �Ǹ� ����(_F)"
+
+#: plugins/notify.c:769
 msgid "Remove when conversation window _receives click"
-msgstr "��ȭâ�� Ŭ���ϸ� ����(_R)"
-
-#. Remove on type button
-#: plugins/notify.c:662
+msgstr "��ȭâ�� Ŭ���ϸ� ����(_R)"
+
+#: plugins/notify.c:774
 msgid "Remove when _typing in conversation window"
 msgstr "��ȭâ���� �޽����� �Է��ϸ� ����(_T)"
 
-#. Remove on message send button
-#: plugins/notify.c:670
-#, fuzzy
-msgid "Remove when a _message gets sent"
-msgstr "�ڸ���� �޽��� ����"
-
-#. Remove on conversation switch button
-#: plugins/notify.c:679
-#, fuzzy
-msgid "Remove on conversation ta_b switch"
-msgstr "��ȭâ�� Ŭ���ϸ� ����(_R)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -523,14 +456,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:858
 msgid "Message Notification"
 msgstr "�޽��� �˸�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:861 plugins/notify.c:863
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "���� ���� �޽����� �˸��� ���� ���� ����� �����մϴ�."
 
@@ -551,15 +484,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
-#: plugins/raw.c:154
+#: plugins/raw.c:151
 msgid "Raw"
 msgstr ""
 
-#: plugins/raw.c:156
+#: plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 
-#: plugins/raw.c:157
+#: plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -590,103 +523,49 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:31
+#: plugins/simple.c:30
 msgid "Simple Plugin"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/simple.c:34 plugins/simple.c:36
+#: plugins/simple.c:33 plugins/simple.c:35
 msgid "Tests to see that most things are working."
 msgstr ""
 
-#: plugins/spellchk.c:412
+#: plugins/spellchk.c:402
 msgid "Text Replacements"
 msgstr "���� ��ȯ"
 
-#: plugins/spellchk.c:436
+#: plugins/spellchk.c:426
 msgid "You type"
 msgstr "�Է�"
 
-#: plugins/spellchk.c:448
+#: plugins/spellchk.c:438
 msgid "You send"
 msgstr "����"
 
-#: plugins/spellchk.c:474
+#: plugins/spellchk.c:464
 msgid "Add a new text replacement"
 msgstr "��ȯ�� ���� ���ϱ�"
 
-#: plugins/spellchk.c:481
+#: plugins/spellchk.c:471
 msgid "You _type:"
 msgstr "�Է��� ��(_T):"
 
-#: plugins/spellchk.c:495
+#: plugins/spellchk.c:485
 msgid "You _send:"
 msgstr "������ ��(_S):"
 
-#: plugins/spellchk.c:535
+#: plugins/spellchk.c:525
 msgid "Text replacement"
 msgstr "���� ��ȯ"
 
-#: plugins/spellchk.c:537 plugins/spellchk.c:538
+#: plugins/spellchk.c:527 plugins/spellchk.c:528
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "����� ���ǵ� ��Ģ�� ���� �������� �޽����� ������ ��ȯ�մϴ�."
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-gnutls.c:190
-msgid "GNUTLS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:287
-msgid "NSS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl.c:91
-msgid "SSL"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -727,14 +606,6 @@
 "idle."
 msgstr "ģ���� �ڸ�����̳� �����Կ��� ���ƿ��ų� ���� �� ��ȭâ�� �˸��ϴ�."
 
-#: plugins/tcl/tcl.c:344
-msgid "Tcl Plugin Loader"
-msgstr ""
-
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
-msgid "Provides support for loading Tcl plugins"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -742,14 +613,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:326
 msgid "Buddy Ticker"
 msgstr "ģ�� ǥ�ñ�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "ģ�� ����� �������� �帣�� ����"
 
@@ -803,7 +674,7 @@
 msgstr "�޽���â�� �����̵� �� ���̱�(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:848
 msgid "Buddy List Window"
 msgstr "ģ�����â"
 
@@ -847,11 +718,11 @@
 
 #: plugins/win32/winprefs/winprefs.c:357
 msgid "_Start Gaim on Windows startup"
-msgstr "�����찡 ���۵� �� ���� �����ϱ�(_S)"
+msgstr "�����찡 ���۵� �� ���� �����ϱ�(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
-#: src/gtkprefs.c:2270
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1448
+#: src/gtkprefs.c:2294
 msgid "Buddy List"
 msgstr "ģ�� ���"
 
@@ -870,8 +741,8 @@
 msgstr "ģ�����â�� �׻� ���� ����(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
-#: src/gtkprefs.c:2271
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:897
+#: src/gtkprefs.c:2295
 msgid "Conversations"
 msgstr "��ȭ"
 
@@ -881,16 +752,16 @@
 
 #: plugins/win32/winprefs/winprefs.c:409
 msgid "WinGaim Options"
-msgstr "������ �ɼ�"
+msgstr "������ �ɼ�"
 
 #: plugins/win32/winprefs/winprefs.c:411 plugins/win32/winprefs/winprefs.c:412
 msgid "Options specific to Windows Gaim."
-msgstr "������ ������ �ɼ��� ���մϴ�."
+msgstr "������ ������ �ɼ��� ���մϴ�."
 
 #: src/about.c:57
 #, c-format
 msgid "About Gaim v%s"
-msgstr "����(v%s)��"
+msgstr "����(v%s)��"
 
 #: src/about.c:89
 msgid ""
@@ -898,7 +769,7 @@
 "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 ""
-"������ AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, Gadu-Gadu ���� ��"
+"������ AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, Gadu-Gadu ���� ��"
 "���ϴ� ��� ����� �޽����Դϴ�.  Gtk+�� �̿��Ͽ� ����������� GPL ���̼���"
 "�� �����ϴ�.<BR><BR>"
 
@@ -926,279 +797,195 @@
 msgid "win32 port"
 msgstr "WIN32 ����"
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:114 src/about.c:115
 msgid "developer"
 msgstr "������"
 
-#: src/about.c:117
+#: src/about.c:116
 msgid "support"
 msgstr "����"
 
-#: src/about.c:124
+#: src/about.c:123
 msgid "Crazy Patch Writers"
 msgstr "�������� ��ġ ����"
 
-#: src/about.c:144
+#: src/about.c:135
 msgid "Retired Developers"
 msgstr "���� ������"
 
-#: src/about.c:145
+#: src/about.c:136
 msgid "former libfaim maintainer"
 msgstr "���� libfaim ������"
 
-#: src/about.c:146
+#: src/about.c:137
 msgid "former lead developer"
 msgstr "���� ���� ������"
 
-#: src/about.c:149
+#: src/about.c:140
 msgid "former maintainer"
 msgstr "���� ������"
 
-#: src/about.c:150
+#: src/about.c:141
 msgid "former Jabber developer"
 msgstr "���� ���(Jabber) ������"
 
-#: src/about.c:151
+#: src/about.c:142
 msgid "original author"
 msgstr "���� ����"
 
-#: src/about.c:154
+#: src/about.c:145
 msgid "hacker and designated driver [lazy bum]"
 msgstr "��Ŀ�� �������� �׽��� [lazy bum]"
 
-#: src/about.c:162
+#: src/about.c:153
 msgid "Current Translators"
 msgstr "���� ������"
 
-#: src/about.c:163 src/about.c:192
+#: src/about.c:154 src/about.c:180
 msgid "Catalan"
 msgstr "īŻ���ƾ�"
 
-#: src/about.c:164 src/about.c:193
+#: src/about.c:155 src/about.c:181
 msgid "Czech"
 msgstr "ü�ھ�"
 
-#: src/about.c:165
+#: src/about.c:156
 msgid "Danish"
 msgstr "����ũ��"
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:157 src/about.c:182
 msgid "German"
 msgstr "���Ͼ�"
 
-#: src/about.c:167 src/about.c:195
+#: src/about.c:158 src/about.c:183
 msgid "Spanish"
 msgstr "�����ξ�"
 
-#: src/about.c:168 src/about.c:196
+#: src/about.c:159 src/about.c:184
 msgid "French"
 msgstr "��������"
 
-#: src/about.c:169
+#: src/about.c:160
 msgid "Hindi"
 msgstr "���ξ�"
 
-#: src/about.c:170
+#: src/about.c:161
 msgid "Hungarian"
 msgstr "�밡����"
 
-#: src/about.c:171 src/about.c:198
+#: src/about.c:162 src/about.c:186
 msgid "Italian"
 msgstr "��Ż���ƾ�"
 
-#: src/about.c:172 src/about.c:200
+#: src/about.c:163 src/about.c:188
 msgid "Korean"
 msgstr "�ѱ���"
 
-#: src/about.c:173
+#: src/about.c:164
 msgid "Dutch; Flemish"
 msgstr "�׵������; Flemish"
 
-#: src/about.c:174 src/about.c:202
-msgid "Polish"
-msgstr "�������"
-
-#: src/about.c:175
+#: src/about.c:165
 msgid "Portuguese-Brazil"
 msgstr "����������(�����)"
 
-#: src/about.c:176
-#, fuzzy
-msgid "Portuguese-Portugal"
-msgstr "����������(�����)"
-
-#: src/about.c:177
+#: src/about.c:166
 msgid "Romanian"
 msgstr "�縶�Ͼƾ�"
 
-#: src/about.c:178 src/about.c:203
-msgid "Russian"
-msgstr "���þƾ�"
-
-#: src/about.c:179
+#: src/about.c:167
 msgid "Serbian"
 msgstr "������ƾ�"
 
-#: src/about.c:180 src/about.c:205
+#: src/about.c:168 src/about.c:193
 msgid "Swedish"
 msgstr "��������"
 
-#: src/about.c:181
+#: src/about.c:169
 msgid "Simplified Chinese"
 msgstr "�߱���(��ü)"
 
-#: src/about.c:182
+#: src/about.c:170
 msgid "Traditional Chinese"
 msgstr "�߱���(��ü)"
 
-#: src/about.c:189
+#: src/about.c:177
 msgid "Past Translators"
 msgstr "���� ������"
 
-#: src/about.c:190
+#: src/about.c:178
 msgid "Amharic"
 msgstr "��Ƽ���Ǿƾ�"
 
-#: src/about.c:191
+#: src/about.c:179
 msgid "Bulgarian"
 msgstr "�Ұ����ƾ�"
 
-#: src/about.c:197
+#: src/about.c:185
 msgid "Hebrew"
 msgstr "������"
 
-#: src/about.c:199
+#: src/about.c:187
 msgid "Japanese"
 msgstr "�Ϻ���"
 
-#: src/about.c:201
+#: src/about.c:189
 msgid "Norwegian"
 msgstr "�븣���̾�"
 
-#: src/about.c:204
+#: src/about.c:190
+msgid "Polish"
+msgstr "�������"
+
+#: src/about.c:191
+msgid "Russian"
+msgstr "���þƾ�"
+
+#: src/about.c:192
 msgid "Slovak"
 msgstr "���ι�Ű�ƾ�"
 
-#: src/about.c:206
+#: src/about.c:194
 msgid "Chinese"
 msgstr "�߱���"
 
-#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
+#: src/about.c:207 src/dialogs.c:3455 src/gtkrequest.c:191
+#: src/protocols/msn/msn.c:238 src/server.c:1544
 msgid "Close"
 msgstr "�ݱ�"
 
-#: src/account.c:265 src/protocols/jabber/jabber.c:918
-msgid "New passwords do not match."
-msgstr "�� �н����尡 ��ġ���� �ʽ��ϴ�."
-
-#: src/account.c:273
-msgid "Fill out all fields completely."
-msgstr "��� �׸��� ������ ä�켼��."
-
-#: src/account.c:298
-#, fuzzy
-msgid "Original password"
-msgstr "���� ��й�ȣ"
-
-#: src/account.c:304
-#, fuzzy
-msgid "New password"
-msgstr "�� ��й�ȣ"
-
-#: src/account.c:310
-#, fuzzy
-msgid "New password (again)"
-msgstr "�� ��й�ȣ Ȯ��"
-
-#: src/account.c:315
-#, fuzzy, c-format
-msgid "Change password for %s"
-msgstr "��й�ȣ �ٲٱ�(%s):"
-
-#: src/account.c:321
-#, fuzzy
-msgid "Please enter your current password and your new password."
-msgstr "��й�ȣ�� �Է��ϼ���"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
-#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
-#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
-#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
-msgid "OK"
-msgstr "Ȯ��"
-
-#. Cancel button.
-#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
-#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
-#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1619
-#: src/gtkaccount.c:2087 src/gtkblist.c:1139 src/gtkblist.c:3038
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
-#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
-#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
-#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
-#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
-#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
-#: src/protocols/yahoo/yahoo.c:2233 src/request.h:852 src/request.h:862
-msgid "Cancel"
-msgstr "���"
-
-#: src/account.c:351
-#, fuzzy, c-format
-msgid "Change user information for %s"
-msgstr "������� ���� ��������"
-
-#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
-#: src/protocols/trepia/trepia.c:337
-msgid "Save"
-msgstr "����"
-
-#: src/away.c:208
+#: src/away.c:207
 msgid "Gaim - Away!"
-msgstr "���� - �ڸ����!"
-
-#: src/away.c:269
+msgstr "���� - �ڸ����!"
+
+#: src/away.c:268
 msgid "I'm Back!"
 msgstr "���ƿԴ�!"
 
-#: src/away.c:368
+#: src/away.c:366
 msgid "New Away Message"
 msgstr "�� �ڸ���� �޽���"
 
-#: src/away.c:388
+#: src/away.c:386
 msgid "Remove Away Message"
 msgstr "�ڸ���� �޽��� ����"
 
-#: src/away.c:583
+#: src/away.c:581
 msgid "Set All Away"
 msgstr "��� �ڸ���� �޽��� ���"
 
-#: src/blist.c:548 src/gtkprefs.c:2273
+#: src/blist.c:440 src/gtkprefs.c:2297
 msgid "Chats"
 msgstr "�"
 
-#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1146
+#. Should never happen.
+#: src/blist.c:515 src/dialogs.c:827 src/protocols/jabber/jabber.c:1833
+#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
+#: src/protocols/msn/notification.c:641
 msgid "Buddies"
 msgstr "ģ��"
 
-#: src/blist.c:1103
+#: src/blist.c:764
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1207,33 +994,63 @@
 "%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[0] ""
-"%s �׷��� %d���� ������ ������� ���� ����� �������� �ʾҽ��ϴ�. ģ���� �׷�"
+"%2$s �׷��� %1$d���� ������ ������� ���� ����� �������� �ʾҽ��ϴ�. ģ���� �׷�"
 "�� ��� �������� �ʾҽ��ϴ�.\n"
 
-#: src/blist.c:1112
+#: src/blist.c:773
 msgid "Group not removed"
 msgstr "�׷��� �������� ����"
 
-#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
-#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
-#: src/protocols/jabber/buddy.c:571
+#: src/blist.c:811 src/gtkaccount.c:140 src/gtkpounce.c:307 src/gtkutils.c:843
+#: src/protocols/jabber/jabber.c:1171
 msgid "Unknown"
 msgstr "�˷����� ����"
 
-#: src/blist.c:1491
+#: src/blist.c:1037
 msgid "Invalid Groupname"
 msgstr "�߸��� �׷� �̸�"
 
-#: src/blist.c:2135
+#: src/blist.c:1794
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "�� ģ�� ��� �Ľ� �߿� ������ �߻��߽��ϴ�. �ε���� �ʾҽ��ϴ�."
 
-#: src/blist.c:2137
+#: src/blist.c:1796
 msgid "Buddy List Error"
 msgstr "ģ�� ��� ����"
 
-#: src/buddy_chat.c:316 src/gtkblist.c:2931
+#. rob wants to inform the user that their buddy lists are
+#. * being converted
+#: src/blist.c:1805
+#, c-format
+msgid ""
+"Gaim is converting your old buddy lists to a new format, which will now be "
+"located at %s"
+msgstr ""
+
+#: src/blist.c:1808
+msgid "Converting Buddy List"
+msgstr "ģ�� ��� ��ȯ"
+
+#: src/browser.c:407 src/browser.c:435
+msgid ""
+"Communication with the browser failed. Please close all windows and try "
+"again."
+msgstr ""
+
+#: src/browser.c:571
+msgid ""
+"Unable to launch your browser because the 'Manual' browser command has been "
+"chosen, but no command has been set."
+msgstr ""
+"���� ������ ������ ���õǾ����� ������ ����־ ������ �� �� �����ϴ�."
+
+#: src/browser.c:591
+#, c-format
+msgid "There was an error launching your chosen browser: %s"
+msgstr ""
+
+#: src/buddy_chat.c:316 src/dialogs.c:1273
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1256,6 +1073,26 @@
 msgid "Join"
 msgstr "����"
 
+#. Cancel button.
+#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:453
+#: src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:865 src/dialogs.c:1557
+#: src/dialogs.c:1672 src/dialogs.c:1738 src/dialogs.c:1991 src/dialogs.c:2140
+#: src/dialogs.c:2812 src/dialogs.c:2979 src/dialogs.c:3021 src/dialogs.c:3158
+#: src/dialogs.c:3502 src/gtkaccount.c:1501 src/gtkconn.c:147
+#: src/gtkprivacy.c:568 src/gtkprivacy.c:581 src/gtkprivacy.c:606
+#: src/gtkprivacy.c:617 src/gtkrequest.c:189 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/jabber.c:4108 src/protocols/msn/msn.c:173
+#: src/protocols/msn/msn.c:184 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:219
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:5753 src/protocols/oscar/oscar.c:5968
+#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6077
+#: src/protocols/trepia/trepia.c:379 src/protocols/yahoo/yahoo.c:1184
+#: src/prpl.c:314 src/request.h:813 src/request.h:823
+msgid "Cancel"
+msgstr "���"
+
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1274,75 +1111,88 @@
 msgid "Enter password for %s"
 msgstr "%s�� ��й�ȣ�� ��������"
 
-#: src/conversation.c:324
+#. Build OK Button
+#: src/connection.c:193 src/dialogs.c:1668 src/dialogs.c:1807
+#: src/dialogs.c:1990 src/dialogs.c:2136 src/dialogs.c:2978 src/dialogs.c:3020
+#: src/dialogs.c:3151 src/dialogs.c:3501 src/gtkrequest.c:188
+#: src/protocols/msn/msn.c:172 src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:194 src/protocols/msn/msn.c:205
+#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
+#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1183
+#: src/request.h:813
+msgid "OK"
+msgstr "Ȯ��"
+
+#: src/conversation.c:424
 msgid "Unable to send message. The message is too large."
 msgstr "�޽����� ���� �� �����ϴ�. �޽����� �ʹ� Ů�ϴ�."
 
-#: src/conversation.c:332
+#: src/conversation.c:432
 msgid "Unable to send message."
 msgstr "�޽����� ���� �� �����ϴ�."
 
-#: src/conversation.c:1888
+#: src/conversation.c:1955
 #, c-format
 msgid "%s entered the room."
 msgstr "%s���� ��ȭ�ǿ� ���Խ��ϴ�."
 
-#: src/conversation.c:1891
+#: src/conversation.c:1958
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>]���� ��ȭ�ǿ� ���Խ��ϴ�."
 
-#: src/conversation.c:1976
+#: src/conversation.c:2043
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s���� %s(��)�� ��ȭ���� �ٲ���ϴ�."
 
-#: src/conversation.c:2018
+#: src/conversation.c:2085
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s���� ��ȭ�ǿ��� �������ϴ�. (%s)"
 
-#: src/conversation.c:2020
+#: src/conversation.c:2087
 #, c-format
 msgid "%s left the room."
 msgstr "%s���� ��ȭ�ǿ��� �������ϴ�."
 
-#: src/conversation.c:2093
+#: src/conversation.c:2160
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d �޽���)"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2162
 #, c-format
 msgid " left the room (%s)."
 msgstr "��ȭ�ǿ��� �������ϴ� (%s)."
 
-#: src/conversation.c:2377
+#: src/conversation.c:2444
 msgid "Last created window"
 msgstr "���������� ������� â"
 
-#: src/conversation.c:2379
+#: src/conversation.c:2446
 msgid "New window"
 msgstr "�� â"
 
-#: src/conversation.c:2381
+#: src/conversation.c:2448
 msgid "By group"
 msgstr "�׷�����"
 
-#: src/conversation.c:2383
+#: src/conversation.c:2450
 msgid "By account"
 msgstr "��������"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:335
 msgid "Warn User"
 msgstr "����� ���"
 
-#: src/dialogs.c:317
+#: src/dialogs.c:338
 msgid "_Warn"
 msgstr "���(_W)"
 
 # c-format
-#: src/dialogs.c:333
+#: src/dialogs.c:354
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1354,197 +1204,371 @@
 "\n"
 "�̰��� %s���� ��� �ܰ踦 ������Ű�� �Ѱ� ������ �����ϰ� ������ ���Դϴ�.\n"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:363
 msgid "Warn _anonymously?"
 msgstr "�͸����� ����� �������(_A)?"
 
-#: src/dialogs.c:349
+#: src/dialogs.c:370
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�͸� ����� ������ �� ����ų �� �ֽ��ϴ�.</b>"
 
-#: src/dialogs.c:462
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s���� ģ�� ��Ͽ��� �����մϴ�. ����ұ��?"
 
-#: src/dialogs.c:464 src/dialogs.c:465
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "ģ�� �����"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:461
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "%s ��ȭ ä���� ģ�� ��Ͽ��� �����մϴ�. ����ұ��?"
 
-#: src/dialogs.c:476 src/dialogs.c:477
+#: src/dialogs.c:463 src/dialogs.c:464
 msgid "Remove Chat"
 msgstr "� �����"
 
-#: src/dialogs.c:486
+#: src/dialogs.c:473
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "�� ģ�� ��Ͽ��� %s �׷�� ��� �׷���� ������� �մϴ�. ����ұ��?"
 
-#: src/dialogs.c:489 src/dialogs.c:490
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Group"
 msgstr "�׷� �����"
 
-#: src/dialogs.c:507
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr "�� ģ�� ��Ͽ��� %s �׷�� ��� �׷���� ������� �մϴ�. ����ұ��?"
-
-#: src/dialogs.c:510 src/dialogs.c:511
-#, fuzzy
-msgid "Remove Contact"
-msgstr "� �����"
-
-#: src/dialogs.c:659
+#: src/dialogs.c:624
 msgid "New Message"
 msgstr "�� �޽���"
 
-#: src/dialogs.c:677
+#: src/dialogs.c:642
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "�޽����� �������� ����� ���̵� �־� �ֽʽÿ�.\n"
 
-#: src/dialogs.c:693 src/dialogs.c:770
+#: src/dialogs.c:658 src/dialogs.c:735
 msgid "_Screenname:"
 msgstr "���̵�(_S):"
 
-#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
+#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "����(_A):"
 
-#: src/dialogs.c:739
+#: src/dialogs.c:704
 msgid "Get User Info"
 msgstr "����� ���� ����"
 
-#: src/dialogs.c:758
+#: src/dialogs.c:723
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "������ ���� ���ϴ� ����� ���̵� ��������.\n"
 
-#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
-#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
+#: src/dialogs.c:861
+msgid "Add Group"
+msgstr "�׷� ���ϱ�"
+
+#: src/dialogs.c:861
+msgid "Add a new group"
+msgstr "�� �׷� ���ϱ�"
+
+#: src/dialogs.c:862
+msgid "Please enter the name of the group to be added."
+msgstr "���� �׷��� �̸��� ��������."
+
+#: src/dialogs.c:864 src/gtkconv.c:1114 src/gtkconv.c:2951 src/gtkconv.c:4120
+#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/oscar/oscar.c:2688 src/prpl.c:313
+msgid "Add"
+msgstr "���ϱ�"
+
+#: src/dialogs.c:890
+msgid "Add Buddy"
+msgstr "ģ�� ���ϱ�"
+
+#: src/dialogs.c:909
+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 ""
+"�� ģ�� ��Ͽ� ���� ����� ���̵� ��������. �ʿ��ϸ� ��Ī�̳� ��ȭ���� ��"
+"�� ���� �ֽ��ϴ�. ��Ī�� ���̵� ���Ǵ� ���� ��� ǥ�õ˴ϴ�.\n"
+
+#: src/dialogs.c:928 src/gtkaccount.c:1578
+msgid "Screen Name"
+msgstr "���̵�"
+
+#: src/dialogs.c:941
+msgid "Alias"
+msgstr "��Ī"
+
+#: src/dialogs.c:951
+msgid "Group"
+msgstr "�׷�"
+
+#. Set up stuff for the account box
+#: src/dialogs.c:960
+msgid "Add To"
+msgstr "���ϱ�"
+
+#: src/dialogs.c:1280
+msgid "Add Chat"
+msgstr "ä�� ���ϱ�"
+
+#: src/dialogs.c:1303
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr "��Ī�� ��Ͽ� ���� ��ȭ�ǿ� �˸��� ������ ��������.\n"
+
+#: src/dialogs.c:1312
+msgid "Account:"
+msgstr "����:"
+
+#: src/dialogs.c:1331 src/gtkaccount.c:428
+msgid "Alias:"
+msgstr "��Ī:"
+
+#: src/dialogs.c:1342
+msgid "Group:"
+msgstr "�׷�:"
+
+#: src/dialogs.c:1421
+msgid "Set Directory Info"
+msgstr "���丮 ���� ����"
+
+#: src/dialogs.c:1429
+msgid "Directory Info"
+msgstr "���丮 ����"
+
+#: src/dialogs.c:1439
+#, c-format
+msgid "Setting Dir Info for %s:"
+msgstr "%s�� ���丮 ���� ����:"
+
+#: src/dialogs.c:1452
+msgid "Allow Web Searches To Find Your Info"
+msgstr ""
+
+#. Line 1
+#: src/dialogs.c:1455 src/dialogs.c:2009 src/protocols/oscar/oscar.c:3957
+#: src/protocols/trepia/trepia.c:299
+msgid "First Name"
+msgstr "��"
+
+#. Line 2
+#: src/dialogs.c:1466 src/dialogs.c:2019
+msgid "Middle Name"
+msgstr "�߰� �̸�"
+
+#. Line 3
+#: src/dialogs.c:1478 src/dialogs.c:2029 src/protocols/gg/gg.c:676
+#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:306
+msgid "Last Name"
+msgstr "�̸�"
+
+#. Line 4
+#: src/dialogs.c:1489 src/dialogs.c:2039
+msgid "Maiden Name"
+msgstr "��ȥ �� ��"
+
+#. Line 5
+#: src/dialogs.c:1500 src/dialogs.c:2049 src/protocols/gg/gg.c:704
+#: src/protocols/oscar/oscar.c:4006 src/protocols/oscar/oscar.c:4022
+#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
+msgid "City"
+msgstr "��/��"
+
+#. Line 6
+#: src/dialogs.c:1511 src/dialogs.c:2058 src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:367
+#: src/protocols/trepia/trepia.c:471
+msgid "State"
+msgstr "��/��"
+
+#. Line 7
+#: src/dialogs.c:1522 src/dialogs.c:2067 src/protocols/jabber/jabber.c:3637
+#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
+msgid "Country"
+msgstr "����"
+
+#: src/dialogs.c:1553 src/dialogs.c:1734 src/dialogs.c:2800 src/dialogs.c:3464
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4107
+#: src/protocols/trepia/trepia.c:378
+msgid "Save"
+msgstr "����"
+
+#: src/dialogs.c:1576
+msgid "New passwords do not match."
+msgstr "�� �н����尡 ��ġ���� �ʽ��ϴ�."
+
+#: src/dialogs.c:1582
+msgid "Fill out all fields completely."
+msgstr "��� �׸��� ������ ä�켼��."
+
+#: src/dialogs.c:1611 src/dialogs.c:1620 src/protocols/gg/gg.c:1194
+#: src/protocols/jabber/jabber.c:4326 src/protocols/oscar/oscar.c:6144
+#: src/protocols/toc/toc.c:1509
+msgid "Change Password"
+msgstr "��й�ȣ �ٲٱ�"
+
+#: src/dialogs.c:1627
+#, c-format
+msgid "Changing password for %s:"
+msgstr "%s�� ��й�ȣ �ٲٱ�:"
+
+#: src/dialogs.c:1635
+msgid "Original Password"
+msgstr "���� ��й�ȣ"
+
+#: src/dialogs.c:1646
+msgid "New Password"
+msgstr "�� ��й�ȣ"
+
+#: src/dialogs.c:1657
+msgid "New Password (again)"
+msgstr "�� ��й�ȣ (�ٽ�)"
+
+#: src/dialogs.c:1697 src/protocols/jabber/jabber.c:4312
+#: src/protocols/oscar/oscar.c:6130 src/protocols/toc/toc.c:1497
 msgid "Set User Info"
 msgstr "����� ���� �Է�"
 
-#: src/dialogs.c:861
+#: src/dialogs.c:1706
 #, c-format
 msgid "Changing info for %s:"
 msgstr "%s�� ���� �ٲٱ�:"
 
-#: src/dialogs.c:963
+#: src/dialogs.c:1793
+msgid "Below are the results of your search: "
+msgstr ""
+
+#: src/dialogs.c:1904
 msgid "Log Conversation"
 msgstr "��ȭ ���"
 
-#: src/dialogs.c:1059
+#: src/dialogs.c:1985 src/dialogs.c:2118
+msgid "Search for Buddy"
+msgstr "ģ�� ã��"
+
+#: src/dialogs.c:2085
+msgid "Find Buddy By Info"
+msgstr "������ ģ�� ã��"
+
+#: src/dialogs.c:2112
+msgid "Find Buddy By Email"
+msgstr "�̸��Ϸ� ģ�� ã��"
+
+#: src/dialogs.c:2125 src/protocols/jabber/jabber.c:3639
+#: src/protocols/yahoo/yahoo.c:1474
+msgid "Email"
+msgstr "����"
+
+#: src/dialogs.c:2216
 msgid "Insert Link"
 msgstr "��ũ �ֱ�"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:2218
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:1083
+#: src/dialogs.c:2237
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "URL�� �߰��Ϸ��� ��ũ�� ���� ������ ��������. ������ ���û����Դϴ�.\n"
 
-#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/jabber.c:594
+#: src/dialogs.c:2261 src/protocols/jabber/jabber.c:3631
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
-#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
+#: src/dialogs.c:2271 src/gtkprefs.c:604 src/gtkprefs.c:1843
+#: src/protocols/jabber/jabber.c:3645
 msgid "Description"
 msgstr "����"
 
-#: src/dialogs.c:1247 src/dialogs.c:1264
+#: src/dialogs.c:2406 src/dialogs.c:2423
 msgid "Select Text Color"
 msgstr "���� ���� ����"
 
-#: src/dialogs.c:1299 src/dialogs.c:1316
+#: src/dialogs.c:2458 src/dialogs.c:2475
 msgid "Select Background Color"
 msgstr "���� ������ ����"
 
-#: src/dialogs.c:1401 src/dialogs.c:1427
+#: src/dialogs.c:2572 src/dialogs.c:2598
 msgid "Select Font"
 msgstr "�۲� ����"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:2664
 msgid "You cannot save an away message with a blank title"
 msgstr "�ڸ���� �޽����� ������ ��� ������ �� �˴ϴ�"
 
-#: src/dialogs.c:1495
+#: src/dialogs.c:2666
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "�޽��� Ÿ��Ʋ�� �ְų� ���� ���� ����Ͻ÷��� \"���\"�� ��������."
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:2676
 msgid "You cannot create an empty away message"
 msgstr "�ڸ���� �޽����� ��� ������ �� �˴ϴ�"
 
-#: src/dialogs.c:1570 src/dialogs.c:1578
+#: src/dialogs.c:2741 src/dialogs.c:2749
 msgid "New away message"
 msgstr "�� �ڸ���� �޽���"
 
-#: src/dialogs.c:1588
+#: src/dialogs.c:2759
 msgid "Away title: "
 msgstr "�ڸ���� ����: "
 
-#: src/dialogs.c:1638
+#: src/dialogs.c:2804
 msgid "Save & Use"
 msgstr "���� �� ���"
 
-#: src/dialogs.c:1642
+#: src/dialogs.c:2808
 msgid "Use"
 msgstr "���"
 
 #. show everything
-#: src/dialogs.c:1791
+#: src/dialogs.c:2957
 msgid "Smile!"
 msgstr "�����!"
 
-#: src/dialogs.c:1809
+#: src/dialogs.c:2975
 msgid "Alias Chat"
 msgstr "ä�� ��Ī"
 
-#: src/dialogs.c:1809
+#: src/dialogs.c:2975
 msgid "Alias chat"
 msgstr "ä�� ��Ī"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:2976
 msgid "Please enter an aliased name for this chat."
 msgstr "�� ��ȭ���� ����� ��Ī�� �Է��ϼ���."
 
-#: src/dialogs.c:1841
+#: src/dialogs.c:3007
 msgid "_Screenname"
 msgstr "���̵�(_S)"
 
-#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
+#: src/dialogs.c:3011 src/gtkblist.c:432 src/gtkblist.c:479
 msgid "_Alias"
 msgstr "��Ī(_A)"
 
-#: src/dialogs.c:1850
+#: src/dialogs.c:3015
 msgid "Alias Buddy"
 msgstr "ģ�� ��Ī"
 
-#: src/dialogs.c:1851
+#: src/dialogs.c:3016
 msgid "Alias buddy"
 msgstr "ģ�� ��Ī"
 
-#: src/dialogs.c:1852
+#: src/dialogs.c:3017
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1552,54 +1576,66 @@
 "�� ģ�� ��Ͽ��� ����� �Ʒ� ������� ��Ī�� �Է��ϰų� �� ������ �̸��� �ٲ�"
 "����."
 
-#: src/dialogs.c:1888 src/dialogs.c:1895
+#: src/dialogs.c:3053 src/dialogs.c:3060
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "%s�� �� �� �����ϴ�."
 
-#: src/dialogs.c:1919
+#: src/dialogs.c:3084
 msgid "Save Log File"
 msgstr "����� ����"
 
-#: src/dialogs.c:1949
+#: src/dialogs.c:3114
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "%s ������ ���� �� �����ϴ�."
 
-#: src/dialogs.c:1968
+#: src/dialogs.c:3133
 msgid "Clear Log"
 msgstr "�α� ����"
 
-#: src/dialogs.c:1977
+#: src/dialogs.c:3142
 msgid "Really clear log?"
 msgstr "������ �α׸� ������?"
 
-#: src/dialogs.c:2022 src/dialogs.c:2193
+#: src/dialogs.c:3187 src/dialogs.c:3358
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "�α� ���� %s��(��) �� �� �����ϴ�."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:3335
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s�԰��� ��ȭ"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:3337
 msgid "System Log"
 msgstr "�ý��� �α�"
 
-#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
+#: src/dialogs.c:3379
 msgid "Date"
 msgstr "��¥"
 
-#: src/dialogs.c:2271
+#: src/dialogs.c:3436
 msgid "Log"
 msgstr "�α�"
 
-#: src/dialogs.c:2294
+#: src/dialogs.c:3459
 msgid "Clear"
 msgstr "�����"
 
+#: src/dialogs.c:3498
+msgid "Rename Group"
+msgstr "�׷� �̸� �ٲٱ�"
+
+#: src/dialogs.c:3498
+msgid "New group name"
+msgstr "�� �׷� �̸�"
+
+#: src/dialogs.c:3499
+msgid "Please enter a new name for the selected group."
+msgstr "���õ� �׷��� �� �̸��� �Է��ϼ���."
+
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1643,7 +1679,7 @@
 
 #: src/gaim-remote.c:139 src/gaim-remote.c:155
 msgid "Gaim not running (on session 0)\n"
-msgstr "������ ����ǰ� ���� ���� (on session 0)\n"
+msgstr "������ ����ǰ� ���� ���� (on session 0)\n"
 
 #: src/gaim-remote.c:167
 msgid ""
@@ -1697,28 +1733,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:369 src/gaimrc.c:1460
+#: src/gaimrc.c:369 src/gaimrc.c:1458
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1717
+#: src/gaimrc.c:1265 src/gtkblist.c:1410
 msgid "Alphabetical"
 msgstr "���ĺ� ��"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1718
+#: src/gaimrc.c:1267 src/gtkblist.c:1411
 msgid "By status"
 msgstr "���� ��"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1719
+#: src/gaimrc.c:1269 src/gtkblist.c:1412
 msgid "By log size"
 msgstr "�α� ũ�� ��"
 
-#: src/gaimrc.c:1558
+#: src/gaimrc.c:1556
 #, c-format
 msgid "Could not open config file %s."
 msgstr "���� ���� %s��(��) �� �� �����ϴ�."
 
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:253
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1729,364 +1765,308 @@
 "<b>���� ũ��:</b> %s\n"
 "<b>�̹��� ũ��:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
+#: src/gtkaccount.c:278 src/protocols/oscar/oscar.c:3085
 msgid "Buddy Icon"
 msgstr "ģ�� ������"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:328
 msgid "Login Options"
 msgstr "�α� �ɼ�"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:345
 msgid "Protocol:"
 msgstr "��������:"
 
-#: src/gtkaccount.c:391
+#: src/gtkaccount.c:350
 msgid "Screenname:"
 msgstr "���̵�:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:55
+#: src/gtkaccount.c:423 src/main.c:299 src/protocols/irc/irc.c:126
 msgid "Password:"
 msgstr "��й�ȣ:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
-msgid "Alias:"
-msgstr "��Ī:"
-
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:432
 msgid "Remember password"
 msgstr "��й�ȣ ����ϱ�"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:486
 msgid "User Options"
 msgstr "����� �ɼ�"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:499
 msgid "New mail notifications"
 msgstr "�� ���� �˸�"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:508
 msgid "Buddy icon file:"
 msgstr "ģ�� ������ ����:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:517
 msgid "_Browse"
 msgstr "ã�ƺ���(_B)"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:523
 msgid "_Reset"
 msgstr "�ǵ�����(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:584
 #, c-format
 msgid "%s Options"
 msgstr "%s �ɼ�"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:705
 msgid "Use Global Proxy Settings"
 msgstr "�⺻ ���Ͻ� ���� ����ϱ�"
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:712
 msgid "No Proxy"
 msgstr "���Ͻ� ��� ����"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:719
 msgid "HTTP"
 msgstr ""
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:726
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:733
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1112
+#: src/gtkaccount.c:740 src/gtkprefs.c:1107
 msgid "Use Environmental Settings"
 msgstr "�⺻ȯ�� ���� ����ϱ�"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:773
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:777
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:793
 msgid "Proxy Options"
 msgstr "���Ͻ� �ɼ�"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1106
+#: src/gtkaccount.c:809 src/gtkprefs.c:1101
 msgid "Proxy _type:"
 msgstr "���Ͻ� ����(_T):"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:818
 msgid "_Host:"
 msgstr "ȣ��Ʈ(_H):"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:822
 msgid "_Port:"
 msgstr "��Ʈ(_P):"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:830
 msgid "_Username:"
 msgstr "������̸�(_U):"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:835
 msgid "Pa_ssword:"
 msgstr "��й�ȣ(_S):"
 
-#: src/gtkaccount.c:1215
+#: src/gtkaccount.c:1164
 msgid "Add Account"
 msgstr "���� ���ϱ�"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1166
 msgid "Modify Account"
 msgstr "���� ��ġ��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1241
+#: src/gtkaccount.c:1190
 msgid "Show more options"
 msgstr "�ڼ��� �ɼ� ����"
 
-#: src/gtkaccount.c:1242
+#: src/gtkaccount.c:1191
 msgid "Show fewer options"
 msgstr "������ �ɼ� ����"
 
 #. Register button
-#: src/gtkaccount.c:1269 src/protocols/jabber/jabber.c:612
+#: src/gtkaccount.c:1218
 msgid "Register"
 msgstr "����"
 
-#: src/gtkaccount.c:1614
+#: src/gtkaccount.c:1496
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "���� %s��(��) ������?"
 
-#: src/gtkaccount.c:1618 src/gtkrequest.c:206
+#: src/gtkaccount.c:1500 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "�����"
 
-#: src/gtkaccount.c:1731
-msgid "Screen Name"
-msgstr "���̵�"
-
-#: src/gtkaccount.c:1754 src/protocols/jabber/jabber.c:866
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
-#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#. state is one of our own strings. it won't be NULL.
+#: src/gtkaccount.c:1601 src/protocols/jabber/jabber.c:3437
+#: src/protocols/jabber/jabber.c:3487 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:4580 src/protocols/oscar/oscar.c:5874
+#: src/protocols/yahoo/yahoo.c:1071 src/protocols/zephyr/zephyr.c:864
+#: src/protocols/zephyr/zephyr.c:874
 msgid "Online"
 msgstr "����"
 
-#: src/gtkaccount.c:1772
+#: src/gtkaccount.c:1619
 msgid "Protocol"
 msgstr "��������"
 
-#: src/gtkaccount.c:2062
-#, 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/gtkaccount.c:2076
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"�� ģ�� ��Ͽ� ���ұ��?"
-
-#: src/gtkaccount.c:2080
-msgid "Gaim - Information"
-msgstr "���� - ����"
-
-#: src/gtkaccount.c:2084
-msgid "Add buddy to your list?"
-msgstr "�� ģ�� ��Ͽ� ģ���� ���ұ��?"
-
-#: src/gtkaccount.c:2086 src/gtkblist.c:3037 src/gtkconv.c:1137
-#: src/gtkconv.c:3017 src/gtkconv.c:4191 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
-msgid "Add"
-msgstr "���ϱ�"
-
-#: src/gtkblist.c:496
-msgid "_Get Info"
-msgstr "���� ����(_G)"
-
-#: src/gtkblist.c:499
-msgid "_IM"
-msgstr "�޽���(_I)"
-
-#: src/gtkblist.c:501
-msgid "Add Buddy _Pounce"
-msgstr "ģ���˸� ���ϱ�(_P)"
-
-#: src/gtkblist.c:503
-msgid "View _Log"
-msgstr "���� ��ȭ ����(_L)"
-
-#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
-msgid "_Remove"
-msgstr "�����(_R)"
-
-#: src/gtkblist.c:597
+#: src/gtkblist.c:413
 msgid "Add a _Buddy"
 msgstr "ģ�� ���ϱ�(_B)"
 
-#: src/gtkblist.c:599
+#: src/gtkblist.c:415
 msgid "Add a C_hat"
 msgstr "ä�� ���ϱ�(_H)"
 
-#: src/gtkblist.c:601
+#: src/gtkblist.c:417
 msgid "_Delete Group"
 msgstr "�׷� �����(_D)"
 
-#: src/gtkblist.c:603
+#: src/gtkblist.c:419
 msgid "_Rename"
 msgstr "�̸� �ٲٱ�(_R)"
 
-#: src/gtkblist.c:611
+#: src/gtkblist.c:427
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:613
+#: src/gtkblist.c:429
 msgid "Auto-Join"
 msgstr "�ڵ� ����"
 
-#: src/gtkblist.c:622 src/gtkblist.c:653
-msgid "_Collapse"
-msgstr ""
-
-#: src/gtkblist.c:658
-msgid "_Expand"
-msgstr ""
+#: src/gtkblist.c:434 src/gtkblist.c:481
+msgid "_Remove"
+msgstr "�����(_R)"
+
+#: src/gtkblist.c:452
+msgid "_Get Info"
+msgstr "���� ����(_G)"
+
+#: src/gtkblist.c:455
+msgid "_IM"
+msgstr "�޽���(_I)"
+
+#: src/gtkblist.c:457
+msgid "Add Buddy _Pounce"
+msgstr "ģ���˸� ���ϱ�(_P)"
+
+#: src/gtkblist.c:459
+msgid "View _Log"
+msgstr "���� ��ȭ ����(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:1088
+#: src/gtkblist.c:785
 msgid "/_Buddies"
 msgstr "/ģ��(_B)"
 
-#: src/gtkblist.c:1089
+#: src/gtkblist.c:786
 msgid "/Buddies/New _Instant Message..."
 msgstr "/ģ��(B)/�� �޽���(_I)..."
 
-#: src/gtkblist.c:1090
+#: src/gtkblist.c:787
 msgid "/Buddies/Join a _Chat..."
 msgstr "/ģ��(B)/ä�ÿ� �����ϱ�(_C)..."
 
-#: src/gtkblist.c:1091
+#: src/gtkblist.c:788
 msgid "/Buddies/Get _User Info..."
 msgstr "/ģ��(B)/����� ���� ����(_U)..."
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:790
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/ģ��(B)/���Ӿ��� ģ�� �����ֱ�(_O)"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:791
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/ģ��(B)/�� �׷� �����ֱ�(_E)"
 
-#: src/gtkblist.c:1095
+#: src/gtkblist.c:792
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/ģ��(B)/ģ�� ���ϱ�(_A)..."
 
-#: src/gtkblist.c:1096
+#: src/gtkblist.c:793
 msgid "/Buddies/Add a C_hat..."
 msgstr "/ģ��(B)/ä�ÿ� �����ϱ�(_H)..."
 
-#: src/gtkblist.c:1097
+#: src/gtkblist.c:794
 msgid "/Buddies/Add a _Group..."
 msgstr "/ģ��(B)/�׷� ���ϱ�(_G)..."
 
-#: src/gtkblist.c:1099
+#: src/gtkblist.c:796
 msgid "/Buddies/_Signoff"
 msgstr "/ģ��(B)/����(_S)"
 
-#: src/gtkblist.c:1100
+#: src/gtkblist.c:797
 msgid "/Buddies/_Quit"
 msgstr "/ģ��(B)/������(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1103
+#: src/gtkblist.c:800
 msgid "/_Tools"
 msgstr "/����(_T)"
 
-#: src/gtkblist.c:1104
+#: src/gtkblist.c:801
 msgid "/Tools/_Away"
 msgstr "/����(T)/�ڸ����(_A)"
 
-#: src/gtkblist.c:1105
+#: src/gtkblist.c:802
 msgid "/Tools/Buddy _Pounce"
 msgstr "/����(T)/ģ���˸�(_P)"
 
-#: src/gtkblist.c:1106
+#: src/gtkblist.c:803
 msgid "/Tools/P_rotocol Actions"
 msgstr "/����(T)/�������� ���� ����(_R)"
 
-#: src/gtkblist.c:1108
+#: src/gtkblist.c:805
 msgid "/Tools/A_ccounts"
 msgstr "/����(T)/���� ����(_C)"
 
-#: src/gtkblist.c:1109
+#: src/gtkblist.c:806
 msgid "/Tools/_File Transfers..."
 msgstr "/����(T)/���� ����(_F)..."
 
-#: src/gtkblist.c:1110
+#: src/gtkblist.c:807
 msgid "/Tools/Preferences"
 msgstr "/����(T)/�⺻ ����..."
 
-#: src/gtkblist.c:1111
+#: src/gtkblist.c:808
 msgid "/Tools/Pr_ivacy"
 msgstr "/����(T)/�����̹���(_I)"
 
-#: src/gtkblist.c:1113
+#: src/gtkblist.c:810
 msgid "/Tools/View System _Log"
 msgstr "/����(T)/�ý��� �α� ����(_L)"
 
 #. Help
-#: src/gtkblist.c:1116
+#: src/gtkblist.c:813
 msgid "/_Help"
 msgstr "/����(_H)"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:814
 msgid "/Help/Online _Help"
 msgstr "/����(H)/�¶��� ����(_H)"
 
-#: src/gtkblist.c:1118
+#: src/gtkblist.c:815
 msgid "/Help/_Debug Window"
 msgstr "/����(H)/����� â(_D)"
 
-#: src/gtkblist.c:1119
+#: src/gtkblist.c:816
 msgid "/Help/_About"
-msgstr "/����(H)/������(_A)"
-
-#: src/gtkblist.c:1135
-msgid "Rename Group"
-msgstr "�׷� �̸� �ٲٱ�"
-
-#: src/gtkblist.c:1135
-msgid "New group name"
-msgstr "�� �׷� �̸�"
-
-#: src/gtkblist.c:1136
-msgid "Please enter a new name for the selected group."
-msgstr "���õ� �׷��� �� �̸��� �Է��ϼ���."
-
-#: src/gtkblist.c:1165
+msgstr "/����(H)/������(_A)"
+
+#: src/gtkblist.c:850
 #, c-format
 msgid ""
 "\n"
@@ -2095,16 +2075,16 @@
 "\n"
 "<b>����:</b> %s"
 
-#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
+#: src/gtkblist.c:900 src/protocols/oscar/oscar.c:5463
 msgid "<b>Status:</b> Offline"
 msgstr "<b>����:</b> ��������"
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:912
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:1250
+#: src/gtkblist.c:926
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2112,7 +2092,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:1251
+#: src/gtkblist.c:927
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2120,7 +2100,7 @@
 "\n"
 "<b>��Ī:</b>"
 
-#: src/gtkblist.c:1252
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2128,7 +2108,7 @@
 "\n"
 "<b>��ȭ��:</b>"
 
-#: src/gtkblist.c:1253
+#: src/gtkblist.c:929
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2136,7 +2116,7 @@
 "\n"
 "<b>������:</b>"
 
-#: src/gtkblist.c:1254
+#: src/gtkblist.c:930
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2144,13 +2124,13 @@
 "\n"
 "<b>���:</b>"
 
-#: src/gtkblist.c:1256
+#: src/gtkblist.c:932
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:1257
+#: src/gtkblist.c:933
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2158,7 +2138,7 @@
 "\n"
 "<b>����</b>: Awesome"
 
-#: src/gtkblist.c:1258
+#: src/gtkblist.c:934
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2166,129 +2146,81 @@
 "\n"
 "<b>����</b>: Rockin"
 
-#: src/gtkblist.c:1514
+#: src/gtkblist.c:1232
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "������ (%d�ð�%02d��)"
 
-#: src/gtkblist.c:1516
+#: src/gtkblist.c:1234
 #, c-format
 msgid "Idle (%dm) "
 msgstr "������ (%d��)"
 
-#: src/gtkblist.c:1520
+#: src/gtkblist.c:1238
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "��� (%d%%) "
 
-#: src/gtkblist.c:1523
+#: src/gtkblist.c:1241
 msgid "Offline "
 msgstr "��������"
 
-#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
+#: src/gtkblist.c:1409 src/gtkprefs.c:845 src/gtkprefs.c:1538
 msgid "None"
 msgstr "�������� ����"
 
-#: src/gtkblist.c:1780
+#: src/gtkblist.c:1472
 msgid "/Tools/Away"
 msgstr "/����(T)/�ڸ����"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1475
 msgid "/Tools/Buddy Pounce"
 msgstr "/����(T)/ģ���˸�"
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:1478
 msgid "/Tools/Protocol Actions"
 msgstr "/����(T)/�������� ���� ����"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1870
+#: src/gtkblist.c:1561
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/ģ��(B)/���Ӿ��� ģ�� �����ֱ�"
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:1563
 msgid "/Buddies/Show Empty Groups"
 msgstr "/ģ��(B)/�� �׷� �����ֱ�"
 
-#: src/gtkblist.c:1890 src/gtkconv.c:1096
+#: src/gtkblist.c:1581 src/gtkconv.c:1073
 msgid "IM"
 msgstr "�޽���"
 
-#: src/gtkblist.c:1896
+#: src/gtkblist.c:1587
 msgid "Send a message to the selected buddy"
 msgstr "���õ� ģ������ �޽��� ������"
 
-#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:1590 src/protocols/napster/napster.c:531
 msgid "Get Info"
 msgstr "���� ����"
 
-#: src/gtkblist.c:1905
+#: src/gtkblist.c:1596
 msgid "Get information on the selected buddy"
 msgstr "���õ� ģ���� ���� ��������"
 
-#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
+#: src/gtkblist.c:1599 src/protocols/oscar/oscar.c:3094
 msgid "Chat"
 msgstr "��ȭ"
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:1604
 msgid "Join a chat room"
 msgstr "��ȭ�ǿ� ����"
 
-#: src/gtkblist.c:1921
+#: src/gtkblist.c:1612
 msgid "Set an away message"
 msgstr "�ڸ���� �޽��� ����"
 
-#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2166
-msgid "Add Buddy"
-msgstr "ģ�� ���ϱ�"
-
-#: src/gtkblist.c:2645
-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 ""
-"�� ģ�� ��Ͽ� ���� ����� ���̵� ��������. �ʿ��ϸ� ��Ī�̳� ��ȭ���� ��"
-"�� ���� �ֽ��ϴ�. ��Ī�� ���̵� ���Ǵ� ���� ��� ǥ�õ˴ϴ�.\n"
-
-#: src/gtkblist.c:2667 src/main.c:289
-msgid "Screen Name:"
-msgstr "���̵�: "
-
-#: src/gtkblist.c:2693 src/gtkblist.c:3000
-msgid "Group:"
-msgstr "�׷�:"
-
-#. Set up stuff for the account box
-#: src/gtkblist.c:2702 src/gtkblist.c:2971
-msgid "Account:"
-msgstr "����:"
-
-#: src/gtkblist.c:2938
-msgid "Add Chat"
-msgstr "ä�� ���ϱ�"
-
-#: src/gtkblist.c:2961
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr "��Ī�� ��Ͽ� ���� ��ȭ�ǿ� �˸��� ������ ��������.\n"
-
-#: src/gtkblist.c:3034
-msgid "Add Group"
-msgstr "�׷� ���ϱ�"
-
-#: src/gtkblist.c:3034
-msgid "Add a new group"
-msgstr "�� �׷� ���ϱ�"
-
-#: src/gtkblist.c:3035
-msgid "Please enter the name of the group to be added."
-msgstr "���� �׷��� �̸��� ��������."
-
-#: src/gtkblist.c:3547
+#: src/gtkblist.c:2606
 msgid "No actions available"
 msgstr "������ �ൿ�� ����"
 
@@ -2317,351 +2249,346 @@
 msgid "Reason Unknown."
 msgstr "������ �˷����� ����."
 
-#: src/gtkconv.c:185
+#: src/gtkconv.c:184
 msgid "That file already exists"
 msgstr "���� ������ �̹� ������"
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:185 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "���� ���� �����?"
 
-#: src/gtkconv.c:241
-#, fuzzy, c-format
-msgid "Failed to store image: %s\n"
-msgstr "%s ������ ���� �� �����ϴ�."
-
-#: src/gtkconv.c:303
+#: src/gtkconv.c:280
 msgid "Gaim - Insert Image"
-msgstr "���� - �׸� ����"
-
-#: src/gtkconv.c:607
+msgstr "���� - �׸� ����"
+
+#: src/gtkconv.c:584
 msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "���� - ��ȭ�Ƿ� ģ���� �ʴ�"
+msgstr "���� - ��ȭ�Ƿ� ģ���� �ʴ�"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:635
+#: src/gtkconv.c:612
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:656
+#: src/gtkconv.c:633
 msgid "_Buddy:"
 msgstr "ģ��(_B):"
 
-#: src/gtkconv.c:676
+#: src/gtkconv.c:653
 msgid "_Message:"
 msgstr "�޽���(_M):"
 
-#: src/gtkconv.c:1104
+#: src/gtkconv.c:1081
 msgid "Un-Ignore"
 msgstr "�������� ����"
 
-#: src/gtkconv.c:1106 src/gtkprefs.c:774
+#: src/gtkconv.c:1083 src/gtkprefs.c:777
 msgid "Ignore"
 msgstr "����"
 
 #. Info button
-#: src/gtkconv.c:1115 src/gtkconv.c:3040
+#: src/gtkconv.c:1092 src/gtkconv.c:2974
 msgid "Info"
 msgstr "����"
 
-#: src/gtkconv.c:1124
+#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3399
 msgid "Get Away Msg"
 msgstr "�ڸ���� �޽��� ����"
 
-#: src/gtkconv.c:1135 src/gtkconv.c:3023 src/gtkconv.c:4176
-#: src/gtkrequest.c:208
+#: src/gtkconv.c:1112 src/gtkconv.c:2957 src/gtkconv.c:4105
+#: src/gtkrequest.c:194
 msgid "Remove"
 msgstr "�����"
 
-#: src/gtkconv.c:2248
+#: src/gtkconv.c:2188
 msgid "User is typing..."
 msgstr "����ڰ� �Է���..."
 
-#: src/gtkconv.c:2256
+#: src/gtkconv.c:2196
 msgid "User has typed something and paused"
 msgstr "����ڰ� ���𰡸� �Է��ϰų� ���� ����"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2359
+#: src/gtkconv.c:2298
 msgid "_Send As"
 msgstr "������(_S)"
 
-#: src/gtkconv.c:2819
+#: src/gtkconv.c:2753
 msgid "Gaim - Save Conversation"
-msgstr "���� - ��ȭ ����"
+msgstr "���� - ��ȭ ����"
 
 #. Conversation menu
-#: src/gtkconv.c:2836
+#: src/gtkconv.c:2770
 msgid "/_Conversation"
 msgstr "/��ȭ(_C)"
 
-#: src/gtkconv.c:2838
+#: src/gtkconv.c:2772
 msgid "/Conversation/_Save As..."
 msgstr "/��ȭ(C)/�ٸ� �̸����� ����(_S)..."
 
-#: src/gtkconv.c:2840
+#: src/gtkconv.c:2774
 msgid "/Conversation/View _Log..."
 msgstr "/��ȭ(C)/���� ��ȭ ����(_L)..."
 
-#: src/gtkconv.c:2844
+#: src/gtkconv.c:2778
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/��ȭ(C)/ģ���˸� ���ϱ�(_P)..."
 
-#: src/gtkconv.c:2846
+#: src/gtkconv.c:2780
 msgid "/Conversation/A_lias..."
 msgstr "/��ȭ(C)/��Ī(_L)..."
 
-#: src/gtkconv.c:2848
+#: src/gtkconv.c:2782
 msgid "/Conversation/_Get Info..."
 msgstr "/��ȭ(C)/���� ����(_G)..."
 
-#: src/gtkconv.c:2850
+#: src/gtkconv.c:2784
 msgid "/Conversation/In_vite..."
 msgstr "/��ȭ(C)/�ʴ�(_V)..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2789
 msgid "/Conversation/Insert _URL..."
 msgstr "/��ȭ(C)/_URL �ֱ�..."
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2791
 msgid "/Conversation/Insert _Image..."
 msgstr "/��ȭ(C)/�׸� �ֱ�(_I)..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2796
 msgid "/Conversation/_Warn..."
 msgstr "/��ȭ(C)/���(_W)..."
 
-#: src/gtkconv.c:2864
+#: src/gtkconv.c:2798
 msgid "/Conversation/_Block..."
 msgstr "/��ȭ(C)/����(_B)"
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2800
 msgid "/Conversation/_Add..."
 msgstr "/��ȭ(C)/���ϱ�(_A)..."
 
-#: src/gtkconv.c:2868
+#: src/gtkconv.c:2802
 msgid "/Conversation/_Remove..."
 msgstr "/��ȭ(C)/�����(_R)..."
 
-#: src/gtkconv.c:2873
+#: src/gtkconv.c:2807
 msgid "/Conversation/_Close"
 msgstr "/��ȭ(C)/�ݱ�(_C)"
 
 #. Options
-#: src/gtkconv.c:2877
+#: src/gtkconv.c:2811
 msgid "/_Options"
 msgstr "/�ɼ�(_O)"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2812
 msgid "/Options/Enable _Logging"
 msgstr "/�ɼ�(O)/����ϱ�(_L)"
 
-#: src/gtkconv.c:2879
+#: src/gtkconv.c:2813
 msgid "/Options/Enable _Sounds"
 msgstr "/�ɼ�(O)/�Ҹ� ���(_S)"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2853
 msgid "/Conversation/View Log..."
 msgstr "/��ȭ(C)/���� ��ȭ ����..."
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:2858
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/��ȭ(C)/ģ�� �˸� ���ϱ�..."
 
-#: src/gtkconv.c:2928
+#: src/gtkconv.c:2862
 msgid "/Conversation/Alias..."
 msgstr "/��ȭ(C)/��Ī..."
 
-#: src/gtkconv.c:2932
+#: src/gtkconv.c:2866
 msgid "/Conversation/Get Info..."
 msgstr "/��ȭ(C)/���� ����..."
 
-#: src/gtkconv.c:2936
+#: src/gtkconv.c:2870
 msgid "/Conversation/Invite..."
 msgstr "/��ȭ(C)/�ʴ�..."
 
-#: src/gtkconv.c:2942
+#: src/gtkconv.c:2876
 msgid "/Conversation/Insert URL..."
 msgstr "/��ȭ(C)/URL �ֱ�..."
 
-#: src/gtkconv.c:2946
+#: src/gtkconv.c:2880
 msgid "/Conversation/Insert Image..."
 msgstr "/��ȭ(C)/�׸� �ֱ�(I)..."
 
-#: src/gtkconv.c:2952
+#: src/gtkconv.c:2886
 msgid "/Conversation/Warn..."
 msgstr "/��ȭ(C)/���..."
 
-#: src/gtkconv.c:2956
+#: src/gtkconv.c:2890
 msgid "/Conversation/Block..."
 msgstr "/��ȭ(C)/����..."
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:2894
 msgid "/Conversation/Add..."
 msgstr "/��ȭ(C)/���ϱ�..."
 
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:2898
 msgid "/Conversation/Remove..."
 msgstr "/��ȭ(C)/�����..."
 
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:2904
 msgid "/Options/Enable Logging"
 msgstr "/�ɼ�(O)/����ϱ�(L)"
 
-#: src/gtkconv.c:2973
+#: src/gtkconv.c:2907
 msgid "/Options/Enable Sounds"
 msgstr "/�ɼ�(O)/�Ҹ� ���(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2997 src/gtkconv.c:2999 src/gtkconv.c:3097 src/gtkconv.c:3099
-#: src/gtkconv.c:5958
+#: src/gtkconv.c:2931 src/gtkconv.c:2933 src/gtkconv.c:3031 src/gtkconv.c:3033
+#: src/gtkconv.c:5882
 msgid "Send"
 msgstr "������"
 
-#: src/gtkconv.c:3020 src/gtkconv.c:4194
+#: src/gtkconv.c:2954 src/gtkconv.c:4123
 msgid "Add the user to your buddy list"
 msgstr "ģ�� ��Ͽ� ����� ���ϱ�"
 
-#: src/gtkconv.c:3026 src/gtkconv.c:4179
+#: src/gtkconv.c:2960 src/gtkconv.c:4108
 msgid "Remove the user from your buddy list"
 msgstr "ģ�� ��Ͽ��� ����� ����"
 
 #. Warn button
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:2967
 msgid "Warn"
 msgstr "���"
 
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:2971
 msgid "Warn the user"
 msgstr "����� ���"
 
-#: src/gtkconv.c:3044 src/gtkconv.c:3479
+#: src/gtkconv.c:2978 src/gtkconv.c:3413
 msgid "Get the user's information"
 msgstr "������� ���� ��������"
 
 #. Block button
-#: src/gtkconv.c:3047 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:2981 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "����"
 
-#: src/gtkconv.c:3051
+#: src/gtkconv.c:2985
 msgid "Block the user"
 msgstr "����� ����"
 
 #. Invite
-#: src/gtkconv.c:3109 src/gtkconv.c:5961
+#: src/gtkconv.c:3043 src/gtkconv.c:5885
 msgid "Invite"
 msgstr "�ʴ�"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3046
 msgid "Invite a user"
 msgstr "����� �ʴ�"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3085
 msgid "Bold"
 msgstr "���ϰ�"
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3096
 msgid "Italic"
 msgstr "�����"
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3107
 msgid "Underline"
 msgstr "����"
 
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3123
 msgid "Larger font size"
 msgstr "���� ũ�⸦ ũ��"
 
-#: src/gtkconv.c:3201
+#: src/gtkconv.c:3135
 msgid "Normal font size"
 msgstr "���� ũ�⸦ ��������"
 
-#: src/gtkconv.c:3213
+#: src/gtkconv.c:3147
 msgid "Smaller font size"
 msgstr "���� ũ�⸦ �۰�"
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3164
 msgid "Font Face"
 msgstr "�۲�"
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3176
 msgid "Foreground font color"
 msgstr "���ڻ�"
 
-#: src/gtkconv.c:3254
+#: src/gtkconv.c:3188
 msgid "Background color"
 msgstr "���� ������"
 
-#: src/gtkconv.c:3269
+#: src/gtkconv.c:3203
 msgid "Insert image"
 msgstr "�׸� �ֱ�"
 
-#: src/gtkconv.c:3280
+#: src/gtkconv.c:3214
 msgid "Insert link"
 msgstr "��ũ �ֱ�"
 
-#: src/gtkconv.c:3291
+#: src/gtkconv.c:3225
 msgid "Insert smiley"
 msgstr "�����ϸ� �ֱ�"
 
-#: src/gtkconv.c:3348
+#: src/gtkconv.c:3282
 msgid "Topic:"
 msgstr "����:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3399
+#: src/gtkconv.c:3333
 msgid "0 people in room"
 msgstr "��ȭ�ǿ� �ƹ��� ����"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3390
 msgid "IM the user"
 msgstr "�޽��� �����"
 
-#: src/gtkconv.c:3468
+#: src/gtkconv.c:3402
 msgid "Ignore the user"
 msgstr "����� ����"
 
-#: src/gtkconv.c:3962 src/server.c:1380
+#: src/gtkconv.c:3899 src/server.c:1370
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- %s �԰��� �� ��ȭ ----</H3><BR>\n"
 
-#: src/gtkconv.c:3966 src/server.c:1383
+#: src/gtkconv.c:3903 src/server.c:1373
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- %s�԰��� �� ��ȭ ----\n"
 
-#: src/gtkconv.c:3999
+#: src/gtkconv.c:3935
 msgid "Close conversation"
 msgstr "��ȭ �ݱ�"
 
-#: src/gtkconv.c:4683 src/gtkconv.c:4715 src/gtkconv.c:4836 src/gtkconv.c:4903
+#: src/gtkconv.c:4601 src/gtkconv.c:4633 src/gtkconv.c:4754 src/gtkconv.c:4821
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "�濡 %d���� ����"
 
-#: src/gtkconv.c:5225
+#: src/gtkconv.c:5158
 msgid "Disable Animation"
 msgstr "�ִϸ��̼� ��"
 
-#: src/gtkconv.c:5234
+#: src/gtkconv.c:5167
 msgid "Enable Animation"
 msgstr "�ִϸ��̼� ���"
 
-#: src/gtkconv.c:5241
+#: src/gtkconv.c:5174
 msgid "Hide Icon"
 msgstr "������ ����"
 
-#: src/gtkconv.c:5247
+#: src/gtkconv.c:5180
 msgid "Save Icon As..."
 msgstr "�� �̸����� ������ ����..."
 
-#: src/gtkconv.c:5728 src/gtkconv.c:5731
+#: src/gtkconv.c:5655 src/gtkconv.c:5658
 msgid "<main>/Conversation/Close"
 msgstr "<����>/��ȭ(C)/�ݱ�(C)"
 
@@ -2767,31 +2694,26 @@
 
 #: src/gtkft.c:1058
 msgid "Gaim - Open..."
-msgstr "���� - ����..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
+msgstr "���� - ����..."
+
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2004
 msgid "Gaim - Save As..."
-msgstr "���� - �� �̸����� ����..."
+msgstr "���� - �� �̸����� ����..."
 
 #: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s���� %s ������ �������� ��(%s)"
 
-#: src/gtkimhtml.c:535
-#, fuzzy
-msgid "_Copy E-Mail Address"
-msgstr "���� �ּ�"
-
-#: src/gtkimhtml.c:547
+#: src/gtkimhtml.c:529
 msgid "_Copy Link Location"
 msgstr "��� ��� ����(_C)"
 
-#: src/gtkimhtml.c:557
+#: src/gtkimhtml.c:536
 msgid "_Open Link in Browser"
 msgstr "���������� ����(_O)"
 
-#: src/gtkimhtml.c:1639
+#: src/gtkimhtml.c:1632
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2799,36 +2721,36 @@
 "���� Ȯ���ڷ� �׸� Ÿ���� �����ϴ� ����� �������� �ʽ��ϴ�.  �⺻�� PNG�Դ�"
 "��."
 
-#: src/gtkimhtml.c:1647
+#: src/gtkimhtml.c:1640
 #, c-format
 msgid "Error saving image: %s"
 msgstr "�̹��� ���� ����: %s"
 
-#: src/gtkimhtml.c:1656
+#: src/gtkimhtml.c:1649
 msgid "Save Image"
 msgstr "�̹��� ����"
 
-#: src/gtkimhtml.c:1679
+#: src/gtkimhtml.c:1671
 msgid "_Save Image..."
 msgstr "�̹��� ����(_S)..."
 
-#: src/gtknotify.c:209
+#: src/gtknotify.c:203
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s��(��) %d���� �� �޽����� �޾ҽ��ϴ�."
 
-#: src/gtknotify.c:217
+#: src/gtknotify.c:211
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:216
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:226
+#: src/gtknotify.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2839,7 +2761,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:235
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2850,28 +2772,6 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
-#, fuzzy
-msgid "Unable to open URL"
-msgstr "USR�� ���� �� ����"
-
-#: src/gtknotify.c:413
-#, fuzzy
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"���� ������ ������ ���õǾ����� ������ ��� �־ ���� �� �� �����ϴ�."
-
-#: src/gtknotify.c:430
-#, fuzzy, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "���ο� ������ ��ȿ���� �ʽ��ϴ�."
-
-#: src/gtknotify.c:437
-#, fuzzy, c-format
-msgid "Error launching \"command\": %s"
-msgstr "�̹��� ���� ����: %s"
-
 #: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "���� �����ϱ�"
@@ -2903,7 +2803,7 @@
 msgid "Pounce When"
 msgstr "����"
 
-#: src/gtkpounce.c:457 src/main.c:339
+#: src/gtkpounce.c:457 src/main.c:331
 msgid "Sign on"
 msgstr "����"
 
@@ -2915,8 +2815,8 @@
 msgid "Return from away"
 msgstr "�ڸ���򿡼� ���ƿ�"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:465 src/gtkprefs.c:1535 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1069
 msgid "Idle"
 msgstr "������"
 
@@ -2961,7 +2861,7 @@
 msgid "Browse"
 msgstr "Ž��"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2087
+#: src/gtkpounce.c:518 src/gtkprefs.c:2121
 msgid "Test"
 msgstr "�׽�Ʈ"
 
@@ -2987,12 +2887,12 @@
 #: src/gtkpounce.c:838
 #, c-format
 msgid "%s has returned from being idle"
-msgstr "%s���� ������ ���·� ���ư�"
+msgstr "%s���� ������ ���¿��� ���ƿ�"
 
 #: src/gtkpounce.c:839
 #, c-format
 msgid "%s has returned from being away"
-msgstr "%s���� �ڸ���� ���·� ���ư�"
+msgstr "%s���� �ڸ���� ���¿��� ���ƿ�"
 
 #: src/gtkpounce.c:840
 #, c-format
@@ -3013,15 +2913,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "�� �� ���� �˸� �̺�Ʈ�Դϴ�. �̰��� �������ּ���!"
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:381
 msgid "Interface Options"
 msgstr "�������̽� �ɼ�"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:383
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "��Ī�� �����Ǿ� ���� ������ ��ȭ�� ����(_I)"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:564
 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."
@@ -3029,358 +2929,360 @@
 "�Ʒ� ��Ͽ��� ����� �����ϸ� �׸��� �����Ͻʽÿ�. ���ο� �׸��� ��Ͽ� ����"
 "�� ���Ƽ� ��ġ�� ���� �ֽ��ϴ�."
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:597
 msgid "Icon"
 msgstr "������"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:671
 msgid "Style"
 msgstr "��Ÿ��"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:672
 msgid "_Bold"
 msgstr "���(_B)"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "�����(_I)"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:676
 msgid "_Underline"
 msgstr "����(_U)"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:678
 msgid "_Strikethrough"
 msgstr "��� ��(_S)"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:681
 msgid "Face"
 msgstr "�۲�"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:684
 msgid "Use custo_m face"
 msgstr "������ �۲� ���(_M)"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:701
 msgid "Use custom si_ze"
 msgstr "������ ũ�� ���(_Z)"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:714
 msgid "Color"
 msgstr "����"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:718
 msgid "_Text color"
 msgstr "���� ����(_T)"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:737
 msgid "Bac_kground color"
 msgstr "���� ����(_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
+#: src/gtkprefs.c:765 src/gtkprefs.c:998 src/gtkprefs.c:1051
 msgid "Display"
 msgstr "����"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:766
 msgid "Show graphical _smileys"
 msgstr "�̸�Ƽ���� �׸�����(_S)"
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:768
 msgid "Show _timestamp on messages"
 msgstr "�޽����� �ð� �����ֱ�(_T)"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:770
 msgid "Show _URLs as links"
 msgstr "_URL�� ��ũ��"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:774
 msgid "_Highlight misspelled words"
 msgstr "Ʋ�� ö�ڸ� ����(_H)"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:778
 msgid "Ignore c_olors"
 msgstr "���� ����(_O)"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:780
 msgid "Ignore font _faces"
 msgstr "�۲� ����(_F)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:782
 msgid "Ignore font si_zes"
 msgstr "���� ũ�� ����(_Z)"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:795
 msgid "Send Message"
 msgstr "�޽��� ������"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:796
 msgid "Enter _sends message"
 msgstr "����Ű�� �޽��� ����(_S)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:798
 msgid "C_ontrol-Enter sends message"
 msgstr "��Ʈ��-���ͷ� �޽��� ����(_O)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:801
 msgid "Window Closing"
 msgstr "â �ݱ�"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:802
 msgid "_Escape closes window"
 msgstr "_Esc Ű�� â ����"
 
-#: src/gtkprefs.c:802
-msgid "Insertions"
-msgstr "�ֱ�"
-
-#: src/gtkprefs.c:803
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "��Ʈ��-{B/I/U}Ű�� _HTML �±� �ֱ�"
-
 #: src/gtkprefs.c:805
+msgid "Insertions"
+msgstr "�ֱ�"
+
+#: src/gtkprefs.c:806
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr "��Ʈ��-{B/I/U}Ű�� _HTML �±� �ֱ�"
+
+#: src/gtkprefs.c:808
 msgid "Control-(number) _inserts smileys"
 msgstr "��Ʈ��-(����)Ű�� �̸�Ƽ�� �ֱ�(_I)"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:825
 msgid "Buddy List Sorting"
 msgstr "ģ�� ��� ����"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:834
 msgid "Sorting:"
 msgstr "����:"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:839
 msgid "Buddy List Toolbar"
 msgstr "ģ�� ��� ��������"
 
-#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Show _buttons as:"
 msgstr "����ó�� ���߸� �����ֱ�(_B): "
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:842 src/gtkprefs.c:970 src/gtkprefs.c:1026
 msgid "Pictures"
 msgstr "�׸�"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:843 src/gtkprefs.c:971 src/gtkprefs.c:1027
 msgid "Text"
 msgstr "����"
 
-#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:844 src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Pictures and text"
 msgstr "�׸��� ����"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
+#: src/gtkprefs.c:849 src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "_Raise window on events"
 msgstr "�޽����� ���� â �ø�(_R)"
 
-#: src/gtkprefs.c:849
+#: src/gtkprefs.c:852
 msgid "Group Display"
 msgstr "�׷� ����"
 
-#: src/gtkprefs.c:850
+#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
+#: src/gtkprefs.c:854
 msgid "Show _numbers in groups"
 msgstr "�׷쿡 ��� ���� ���̱�(_N)"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:857
 msgid "Buddy Display"
 msgstr "ģ�� �����ֱ�"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:998
+#: src/gtkprefs.c:858 src/gtkprefs.c:993
 msgid "Show buddy _icons"
 msgstr "ģ�� ������ �����ֱ�(_I)"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:860
 msgid "Show _warning levels"
 msgstr "��� ���� �����ֱ�(_W)"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:863
 msgid "Show idle _times"
 msgstr "��� ���� �ð� �����ֱ�(_T)"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:877
 msgid "Dim i_dle buddies"
 msgstr "�����ϴ� ģ���� ȸ������(_D)"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:901
 msgid "_Placement:"
 msgstr "��ġ(_P):"
 
-#: src/gtkprefs.c:905
+#: src/gtkprefs.c:910
 msgid "Send _URLs as Links"
 msgstr "_URL�� ��ũ�� ����"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:913
 msgid "Tab Options"
 msgstr "�� �ɼ�"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:915
 msgid "_Tab Placement:"
 msgstr "�� ��ġ(_T):"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:917
 msgid "Top"
 msgstr "��"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:918
 msgid "Bottom"
 msgstr "�Ʒ�"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:919
 msgid "Left"
 msgstr "����"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:920
 msgid "Right"
 msgstr "������"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:926
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�޽����� ä���� �� â���� ������(_T)"
 
-#: src/gtkprefs.c:924
-#, fuzzy
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "�޽����� ä���� �� â���� ������(_T)"
-
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:929
 msgid "Show _close button on tabs"
 msgstr "�ǿ��� �ݱ� ���߸� �����ֱ�(_C): "
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:940
 msgid "Show status _icons on tabs"
 msgstr "�ǿ��� ���� ������ �����ֱ�(_I)"
 
-#: src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Window"
 msgstr "â"
 
-#: src/gtkprefs.c:982 src/gtkprefs.c:1038
+#: src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "New window _width:"
 msgstr "�� ��ȭâ�� ��(_W):"
 
-#: src/gtkprefs.c:985 src/gtkprefs.c:1041
+#: src/gtkprefs.c:980 src/gtkprefs.c:1036
 msgid "New window _height:"
 msgstr "�� ��ȭâ�� ����(_H):"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1044
+#: src/gtkprefs.c:983 src/gtkprefs.c:1039
 msgid "_Entry field height:"
 msgstr "��ȭ �Է� ������ ����(_E):"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:988
 msgid "Hide window on _send"
 msgstr "�޽��� ���� �� â ����(_S)"
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:992
 msgid "Buddy Icons"
 msgstr "ģ�� ������"
 
-#: src/gtkprefs.c:1000
+#: src/gtkprefs.c:995
 msgid "Enable buddy icon a_nimation"
 msgstr "ģ�� ������ �ִϸ��̼� ��(_N)"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:999
 msgid "Show _logins in window"
 msgstr "â���� ���� �����ֱ�(_L)"
 
-#: src/gtkprefs.c:1006
+#: src/gtkprefs.c:1001
 msgid "Show a_liases in tabs/titles"
 msgstr "��/���� ���� ����(_L)"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1004
 msgid "Typing Notification"
 msgstr "Ÿ���� �˸�"
 
-#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:1005
 msgid "Notify buddies that you are _typing to them"
 msgstr "ģ������ Ÿ������ �� �˸�(_T)"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1045
 msgid "Tab Completion"
 msgstr "�ڵ��ϼ�"
 
-#: src/gtkprefs.c:1051
+#: src/gtkprefs.c:1046
 msgid "_Tab-complete nicks"
 msgstr "�� Ű�� ���� �ڵ��ϼ�(_T)"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1048
 msgid "_Old-style tab completion"
 msgstr "���� �� �ڵ��ϼ�(_O)"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1052
 msgid "_Show people joining in window"
 msgstr "����ڰ� �����ϴ� ���� â���� ������(_S)"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1054
 msgid "_Show people leaving in window"
 msgstr "����ڰ� ������ ���� â���� ������(_S)"
 
-#: src/gtkprefs.c:1061
+#: src/gtkprefs.c:1056
 msgid "Co_lorize screennames"
 msgstr "���� �ִ� ���̵�(_L)"
 
-#: src/gtkprefs.c:1105
+#: src/gtkprefs.c:1100
 msgid "Proxy Type"
 msgstr "���Ͻ� ����"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1103
 msgid "No proxy"
 msgstr "���Ͻ� ��� ����"
 
-#: src/gtkprefs.c:1115
+#: src/gtkprefs.c:1110
 msgid "Proxy Server"
 msgstr "���Ͻ� ����"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1131
 msgid "_Host"
 msgstr "ȣ��Ʈ(_H)"
 
-#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
-#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1617
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
+#. Account Options
+#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:508
+#: src/protocols/jabber/jabber.c:4429 src/protocols/msn/msn.c:1395
+#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
 msgid "Port"
 msgstr "��Ʈ"
 
-#: src/gtkprefs.c:1171
+#: src/gtkprefs.c:1166
 msgid "_User"
 msgstr "�����(_U)"
 
-#: src/gtkprefs.c:1188
+#: src/gtkprefs.c:1183
 msgid "Pa_ssword"
 msgstr "��й�ȣ(_S)"
 
-#: src/gtkprefs.c:1225
+#: src/gtkprefs.c:1239
+#, c-format
+msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
+msgstr ""
+
+#: src/gtkprefs.c:1259
 msgid "Opera"
 msgstr "�����"
 
-#: src/gtkprefs.c:1226
+#: src/gtkprefs.c:1260
 msgid "Netscape"
 msgstr "�ݽ�������"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1261
 msgid "Mozilla"
 msgstr "������"
 
-#: src/gtkprefs.c:1228
+#: src/gtkprefs.c:1262
 msgid "Konqueror"
 msgstr "������"
 
-#: src/gtkprefs.c:1229
+#: src/gtkprefs.c:1263
 msgid "Galeon"
 msgstr "������"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1272
 msgid "Manual"
 msgstr "����"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1313
 msgid "Browser Selection"
 msgstr "������ ����"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1317
 msgid "_Browser:"
 msgstr "������(_B):"
 
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1327
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3389,87 +3291,87 @@
 "����(_M):\n"
 "(%s�� URL)"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1348
 msgid "Browser Options"
 msgstr "������ �ɼ�"
 
-#: src/gtkprefs.c:1315
+#: src/gtkprefs.c:1349
 msgid "Open new _window by default"
 msgstr "�� â���� ���⸦ �⺻���� ��(_W)"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1364
 msgid "Message Logs"
 msgstr "�޽��� �α�"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1365
 msgid "_Log all instant messages"
 msgstr "��� �޽��� ��ȭ�� ���(_L)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1367
 msgid "Log all c_hats"
 msgstr "��� ��ȭ�� ���(_H)"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1369
 msgid "Strip _HTML from logs"
 msgstr "_HTML �±׸� ���� ���"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1372
 msgid "System Logs"
 msgstr "�ý��� �α�"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1373
 msgid "Log when buddies _sign on/sign off"
 msgstr "ģ���� ����/���� ���(_S)"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1375
 msgid "Log when buddies become _idle/un-idle"
 msgstr "ģ���� ������/����� ���(_I)"
 
-#: src/gtkprefs.c:1343
+#: src/gtkprefs.c:1377
 msgid "Log when buddies go away/come _back"
 msgstr "�ڽ��� �ڸ����/���ƿ� ���(_B)"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1379
 msgid "Log your _own signons/idleness/awayness"
 msgstr "�ڽ��� ����/������/�ڸ���� ���(_O)"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1381
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "ģ������ ������ �α����� ���(_N)"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1424
 msgid "Sound Options"
 msgstr "�Ҹ� �ɼ�"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1425
 msgid "_No sounds when you log in"
 msgstr "���ӽ� �Ҹ� ����(_N)"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1427
 msgid "_Sounds while away"
 msgstr "�ڸ����� �Ҹ� ��(_S)"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1431
 msgid "Sound Method"
 msgstr "�Ҹ� ���� ���"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1432
 msgid "_Method:"
 msgstr "���(_M):"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1434
 msgid "Console beep"
 msgstr "������"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1436
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1443
 msgid "Command"
 msgstr "����"
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3478,68 +3380,67 @@
 "�Ҹ� �� ���ɾ�(_O):\n"
 "(%s�� ���� �̸�)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1508
 msgid "_Sending messages removes away status"
 msgstr "�޽����� ������ �ڸ���� ���¿��� ������(_S)"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1510
 msgid "_Queue new messages when away"
 msgstr "�ڸ���� �߿� ���� �� �޽��� ����(_Q)"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1513
 msgid "Auto-response"
 msgstr "�ڵ� ����"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1516
 msgid "Seconds before _resending:"
 msgstr "���� �ð�(��) �ڿ� ����(_R)"
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1519
 msgid "_Send auto-response"
 msgstr "�ڵ� ���� ����(_S)"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1521
 msgid "_Only send auto-response when idle"
 msgstr "������ ���¿����� �ڵ� ����(_O)"
 
-#: src/gtkprefs.c:1489
-#, fuzzy
-msgid "Send auto-response in _active conversations"
-msgstr "��ȭ ���� ���¿��� �ڵ� ���� ����"
-
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1523
+msgid "Send auto-response in active conversations"
+msgstr "��ȭ Ȱ��ȭ ���¿��� �ڵ� ���� ����"
+
+#: src/gtkprefs.c:1536
 msgid "Idle _time reporting:"
 msgstr "������ �ð� �����ϱ�(_T)"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1539
 msgid "Gaim usage"
-msgstr "���� ������� ���� �ð� �����ֱ�"
-
-#: src/gtkprefs.c:1505
+msgstr "���� ������� ���� �ð� �����ֱ�"
+
+#: src/gtkprefs.c:1542
 msgid "X usage"
 msgstr "X�� ������� ���� �ð� �����ֱ�"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1544
 msgid "Windows usage"
 msgstr "â ���"
 
-#: src/gtkprefs.c:1515
+#: src/gtkprefs.c:1552
 msgid "Auto-away"
 msgstr "�ڵ����� �ڸ����"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1553
 msgid "Set away _when idle"
 msgstr "������ ���½� �ڸ���� ǥ��(_W)"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1555
 msgid "_Minutes before setting away:"
 msgstr "���� �ð�(��) �Ŀ� �ڸ���� ǥ��(_M):"
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1562
 msgid "Away m_essage:"
 msgstr "�ڸ���� �޽���(_E):"
 
-#: src/gtkprefs.c:1587
+#: src/gtkprefs.c:1624
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3554,7 +3455,7 @@
 "<span weight=\"bold\">�� ����Ʈ:</span>\t%s\n"
 "<span weight=\"bold\">���ϸ�:</span>\t%s"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1629
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3569,97 +3470,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">���ϸ�:</span>  %s"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1807
 msgid "Load"
 msgstr "�ҷ�����"
 
-#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
-#: src/protocols/msn/msn.c:1303 src/protocols/trepia/trepia.c:392
+#: src/gtkprefs.c:1814 src/protocols/msn/msn.c:1214
+#: src/protocols/trepia/trepia.c:433
 msgid "Name"
 msgstr "�̸�"
 
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:1861
 msgid "Details"
 msgstr "����"
 
-#: src/gtkprefs.c:1954
+#: src/gtkprefs.c:1988
 msgid "Sound Selection"
 msgstr "�Ҹ� ����"
 
-#: src/gtkprefs.c:2061
-msgid "Play"
-msgstr "���"
-
-#: src/gtkprefs.c:2068
-msgid "Event"
-msgstr "�̺�Ʈ"
-
-#: src/gtkprefs.c:2091
-msgid "Reset"
-msgstr "����"
-
 #: src/gtkprefs.c:2095
+msgid "Play"
+msgstr "���"
+
+#: src/gtkprefs.c:2102
+msgid "Event"
+msgstr "�̺�Ʈ"
+
+#: src/gtkprefs.c:2125
+msgid "Reset"
+msgstr "����"
+
+#: src/gtkprefs.c:2129
 msgid "Choose..."
 msgstr "����"
 
-#: src/gtkprefs.c:2229
+#: src/gtkprefs.c:2253
 msgid "_Edit"
 msgstr "��ġ��(_E)"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2289
 msgid "Interface"
 msgstr "�������̽�"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2290
 msgid "Smiley Themes"
 msgstr "�����ϸ� �׸�"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2291
 msgid "Fonts"
 msgstr "�۲�"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2292
 msgid "Message Text"
 msgstr "�޽��� ����"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2293
 msgid "Shortcuts"
 msgstr "����Ű"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2296
 msgid "IMs"
 msgstr "�޽���"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2298
 msgid "Proxy"
 msgstr "���Ͻ�"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2301
 msgid "Browser"
 msgstr "������"
 
-#: src/gtkprefs.c:2279
+#: src/gtkprefs.c:2303
 msgid "Logging"
 msgstr "���"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2304
 msgid "Sounds"
 msgstr "�Ҹ�"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2305
 msgid "Sound Events"
 msgstr "�Ҹ�"
 
-#: src/gtkprefs.c:2282
+#: src/gtkprefs.c:2306
 msgid "Away / Idle"
 msgstr "�ڸ���� / ������"
 
-#: src/gtkprefs.c:2283
+#: src/gtkprefs.c:2307
 msgid "Away Messages"
 msgstr "�ڸ����"
 
-#: src/gtkprefs.c:2286
+#: src/gtkprefs.c:2310
 msgid "Plugins"
 msgstr "�÷�����"
 
@@ -3747,15 +3648,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
 msgid "Yes"
 msgstr "Ȯ��"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
 msgid "No"
 msgstr "���"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:190
 msgid "Apply"
 msgstr "����"
 
@@ -3818,13 +3719,43 @@
 "launched: %s"
 msgstr "������ ����(%s)�� ����� �� ���� �Ҹ��� �� �� �����ϴ�."
 
-#: src/gtkutils.c:286
+#: src/gtkutils.c:290
 msgid "Can't save icon file to disk."
 msgstr "������ ������ ������ �� �����ϴ�."
 
-#: src/gtkutils.c:321
+#: src/gtkutils.c:325
 msgid "Gaim - Save Icon"
-msgstr "���� - ������ ����"
+msgstr "���� - ������ ����"
+
+#. full help text
+#: src/gtkutils.c:1038
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+
+#. short message
+#: src/gtkutils.c:1053
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. �� ���� ������ ���ϸ� `%s -h'�� �Է��ϼ���.\n"
+
+#: src/html.c:345
+msgid "g003: Error opening connection.\n"
+msgstr "g003: ������ ���� �߻�.\n"
 
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
@@ -3944,45 +3875,23 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr ""
 
-#: src/main.c:148
+#: src/main.c:140
 msgid "Please enter your login."
 msgstr "����� ������ �Է��ϼ���."
 
-#: src/main.c:231
+#: src/main.c:223
 msgid "<New User>"
 msgstr "<�� �����>"
 
-#: src/main.c:273
+#: src/main.c:265
 msgid "Login"
 msgstr "����"
 
-#. full help text
-#: src/main.c:550
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-
-#. short message
-#: src/main.c:565
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. �� ���� ������ ���ϸ� `%s -h'�� �Է��ϼ���.\n"
-
-#: src/plugin.c:260
+#: src/main.c:281
+msgid "Screen Name:"
+msgstr "���̵�: "
+
+#: src/plugin.c:257
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3990,327 +3899,298 @@
 msgstr ""
 "%s �÷������� ã�� �� �����ϴ�. �� �÷������� ��ġ�ϰ� �ٽ� �õ��ϼ���."
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:262 src/plugin.c:290
 msgid "Gaim was unable to load your plugin."
-msgstr "������ �÷������� �о���� �� �����ϴ�."
-
-#: src/plugin.c:289
+msgstr "������ �÷������� �о���� �� �����ϴ�."
+
+#: src/plugin.c:286
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "%s �÷������� �о���� �� �����ϴ�."
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:270
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1186
+#: src/protocols/msn/msn.c:338 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1255
+#: src/protocols/yahoo/yahoo.c:1334
 msgid "Available"
 msgstr "�޽��� ���� �� ����"
 
-#: src/protocols/gg/gg.c:50
+#: src/protocols/gg/gg.c:53
 msgid "Available for friends only"
 msgstr "ģ���鿡�Ը� �޽��� ���� �� ����"
 
-#: src/protocols/gg/gg.c:52
-msgid "Away for friends only"
-msgstr "ģ���鿡�Ը� �ڸ���� ǥ��"
-
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
-#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
-#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
-#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
-msgid "Invisible"
-msgstr "������ �ʵ��� ��"
-
-#: src/protocols/gg/gg.c:54
-msgid "Invisible for friends only"
-msgstr "ģ���鿡�Ը� ������ �ʵ��� ��"
-
 #: src/protocols/gg/gg.c:55
+msgid "Away for friends only"
+msgstr "ģ���鿡�Ը� �ڸ���� ǥ��"
+
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:4570 src/protocols/oscar/oscar.c:4597
+#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1067
+#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1344
+msgid "Invisible"
+msgstr "������ �ʵ��� ��"
+
+#: src/protocols/gg/gg.c:57
+msgid "Invisible for friends only"
+msgstr "ģ���鿡�Ը� ������ �ʵ��� ��"
+
+#: src/protocols/gg/gg.c:58
 msgid "Unavailable"
 msgstr "�޽��� ���� �� ����"
 
-#: src/protocols/gg/gg.c:136
+#: src/protocols/gg/gg.c:139
 msgid "Unable to resolve hostname."
 msgstr "ȣ��Ʈ�� IP�� �� �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:142
 msgid "Unable to connect to server."
 msgstr "������ ������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:142
-msgid "Invalid response from server."
-msgstr "�����κ��� ��ȿ���� ���� ������ �Խ��ϴ�."
-
 #: src/protocols/gg/gg.c:145
+msgid "Invalid response from server."
+msgstr "�����κ��� ��ȿ���� ���� ������ �Խ��ϴ�."
+
+#: src/protocols/gg/gg.c:148
 msgid "Error while reading from socket."
 msgstr "���Ͽ��� �д� �߿� ������ �߻��߽��ϴ�."
 
-#: src/protocols/gg/gg.c:148
-msgid "Error while writing to socket."
-msgstr "���Ͽ� ���� �߿� ������ �߻��߽��ϴ�."
-
 #: src/protocols/gg/gg.c:151
-msgid "Authentication failed."
-msgstr "���� ����."
+msgid "Error while writing to socket."
+msgstr "���Ͽ� ���� �߿� ������ �߻��߽��ϴ�."
 
 #: src/protocols/gg/gg.c:154
+msgid "Authentication failed."
+msgstr "���� ����."
+
+#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "�� �� ���� ���� �ڵ�."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:262
 #, c-format
 msgid "Status: %s"
 msgstr "����: %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:283
 msgid "Could not connect"
 msgstr "������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:290
 msgid "Unable to read socket"
 msgstr "������ ���� �� �����ϴ�."
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:208
 msgid "Unable to connect."
 msgstr "������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:415
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "�����͸� �д� ��"
 
-#: src/protocols/gg/gg.c:418
-msgid "Balancer handshake"
-msgstr "�뷱�� �Ǽ�"
-
 #: src/protocols/gg/gg.c:421
+msgid "Balancer handshake"
+msgstr "�뷱�� �Ǽ�"
+
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "���� Ű�� �д� ��"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Ű �ؽ��� ��ȯ�ϴ� ��"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "GG ���̺귯������ ġ������ ����\n"
 
-#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/toc/toc.c:184
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s���� ������ ������ϴ�."
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "������ ���� ���� �� ����"
 
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "�޽����� ������"
 
-#: src/protocols/gg/gg.c:517
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "GG ������ � ��"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "�߸��� ����-���� UIN�� ������"
 
-#: src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "�߸��� ����-���� UIN���� �޽����� �������� �ϰ��ֽ��ϴ�."
 
-#: src/protocols/gg/gg.c:629
+#: src/protocols/gg/gg.c:632
 msgid "Couldn't get search results"
 msgstr "� ����� ���� �� ����"
 
-#: src/protocols/gg/gg.c:634
+#: src/protocols/gg/gg.c:637
 msgid "Gadu-Gadu Search Engine"
 msgstr "����-���� �˻� ����"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:662
 msgid "Active"
 msgstr "Ȱ��ȭ"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3952
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
+#: src/protocols/gg/gg.c:671
 msgid "First name"
 msgstr "�̸�"
 
-#. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
-#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
-msgid "Last Name"
-msgstr "�̸�"
-
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1379
+#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3954
 msgid "Nick"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
 msgid "Birth year"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "����"
 
-#. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
-#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
-#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
-msgid "City"
-msgstr "��/��"
-
-#. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1241
-#: src/protocols/msn/msn.c:1483 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
-#, fuzzy
-msgid "Buddy Information"
-msgstr "���� ����"
-
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:737
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu ������ ģ�� ����� �����ϴ�."
 
-#: src/protocols/gg/gg.c:749
+#: src/protocols/gg/gg.c:745
 msgid "Couldn't Import Buddy List from Server"
 msgstr "�������� ģ�� ����� ������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:808
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Gadu-Gadu �������� ģ�� ����� ���������� �����Խ��ϴ�."
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:816
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Gadu-Gadu ������ ģ�� ����� ���� �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Gadu-Gadu �������� ģ�� ����� �������ϴ�."
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:832
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Gadu-Gadu �������� ģ�� ����� ���� �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:840
 msgid "Password changed successfully"
 msgstr "��й�ȣ�� ���������� �ٲپ����ϴ�."
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:847
 msgid "Password couldn't be changed"
 msgstr "��й�ȣ�� �ٲ� �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:968
+#: src/protocols/gg/gg.c:964
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Gadu-Gadu ������ ���� ����"
 
-#: src/protocols/gg/gg.c:969
+#: 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 ""
-"������ Gadu-Gadu HTTP ���� ���� ������ ���� ��û�� �Ϸ���� �ʾҽ��ϴ�.��� "
+"������ Gadu-Gadu HTTP ���� ���� ������ ���� ��û�� �Ϸ���� �ʾҽ��ϴ�.��� "
 "�Ŀ� �ٽ� �õ��ϼ���."
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:993
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu ģ�� ����� ������ �� ����"
 
-#: src/protocols/gg/gg.c:998
+#: src/protocols/gg/gg.c:994
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
-"������ Gadu-Gadu ģ�� ��� ������ �������� ���߽��ϴ�. ��� �Ŀ� �ٽ� �õ���"
+"������ Gadu-Gadu ģ�� ��� ������ �������� ���߽��ϴ�. ��� �Ŀ� �ٽ� �õ���"
 "����."
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1063
 msgid "Couldn't export buddy list"
 msgstr "ģ�� ����� ������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
+#: src/protocols/gg/gg.c:1064 src/protocols/gg/gg.c:1087
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
-"������ ģ�� ��� ������ �������� ���߽��ϴ�. ��� �Ŀ� �ٽ� �õ��ϼ���."
-
-#: src/protocols/gg/gg.c:1094
+"������ ģ�� ��� ������ �������� ���߽��ϴ�. ��� �Ŀ� �ٽ� �õ��ϼ���."
+
+#: src/protocols/gg/gg.c:1086
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu ģ�� ����� ���� �� ����"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1135
 msgid "Unable to access directory"
 msgstr "���丮�� ������ �� ����"
 
-#: src/protocols/gg/gg.c:1144
+#: src/protocols/gg/gg.c:1136
 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:1177
+#: src/protocols/gg/gg.c:1169
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Gadu-Gadu ��й�ȣ�� �ٲ� �� ����"
 
-#: src/protocols/gg/gg.c:1178
+#: src/protocols/gg/gg.c:1170
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
-"������ Gadu-Gadu ���� ���� ������ ��й�ȣ�� �ٲ��� ���߽��ϴ�. ��� �Ŀ� ��"
+"������ Gadu-Gadu ���� ���� ������ ��й�ȣ�� �ٲ��� ���߽��ϴ�. ��� �Ŀ� ��"
 "�� �õ��ϼ���."
 
-#: src/protocols/gg/gg.c:1195
+#: src/protocols/gg/gg.c:1186
 msgid "Directory Search"
 msgstr "���丮���� ã��"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
-#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
-msgid "Change Password"
-msgstr "��й�ȣ �ٲٱ�"
-
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1202
 msgid "Import Buddy List from Server"
 msgstr "�������� ģ�� ��� ��������"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1208
 msgid "Export Buddy List to Server"
 msgstr "ģ�� ����� ������ ������"
 
-#: src/protocols/gg/gg.c:1224
+#: src/protocols/gg/gg.c:1214
 msgid "Delete Buddy List from Server"
 msgstr "�������� ģ�� ��� �����"
 
-#: src/protocols/gg/gg.c:1257
+#: src/protocols/gg/gg.c:1247
 msgid "Unable to access user profile."
 msgstr "����� �Ұ��� ������ �� �����ϴ�."
 
-#: src/protocols/gg/gg.c:1258
+#: src/protocols/gg/gg.c:1248
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
-"������ ���丮 ���� ���� ������ ���� ����� �Ұ��� �������� ���߽��ϴ�. ��"
+"������ ���丮 ���� ���� ������ ���� ����� �Ұ��� �������� ���߽��ϴ�. ��"
 "�� �Ŀ� �ٽ� �õ��ϼ���."
 
 #. *< api_version
@@ -4323,30 +4203,28 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1360 src/protocols/gg/gg.c:1362
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "����-���� �������� �÷�����"
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "������ ICQ ���� ������ �������ϴ�."
+msgstr "������ ICQ ���� ������ �������ϴ�."
 
 #: src/protocols/icq/gaim_icq.c:294
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "%s(%s%s%s%s%s)���� �� ������ ��û�մϴ�."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
-#: src/protocols/msn/notification.c:935 src/protocols/msn/notification.c:1256
-#: src/protocols/msn/notification.c:1422 src/protocols/oscar/oscar.c:2609
-#: src/protocols/oscar/oscar.c:5080
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:463 src/protocols/msn/notification.c:744
+#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5129
 msgid "Authorize"
 msgstr "����"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
-#: src/protocols/msn/notification.c:936 src/protocols/msn/notification.c:1258
-#: src/protocols/msn/notification.c:1424 src/protocols/oscar/oscar.c:2611
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1719
+#: src/protocols/msn/notification.c:464 src/protocols/msn/notification.c:746
+#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5130
 msgid "Deny"
 msgstr "�ź�"
 
@@ -4364,7 +4242,7 @@
 
 #: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
-msgstr "���� �����"
+msgstr "���� �����"
 
 #: src/protocols/irc/cmds.c:41
 #, c-format
@@ -4398,43 +4276,17 @@
 msgid "No topic is set"
 msgstr "������ ����"
 
-#: src/protocols/irc/irc.c:64
-msgid "Error displaying MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:64
-#, fuzzy
-msgid "No MOTD available"
-msgstr "����� �� ����"
-
-#: src/protocols/irc/irc.c:65
-msgid "There is no MOTD associated with this connection."
-msgstr ""
-
-#: src/protocols/irc/irc.c:68
-#, c-format
-msgid "MOTD for %s"
-msgstr ""
-
-#: src/protocols/irc/irc.c:137
-msgid "View MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:156
+#: src/protocols/irc/irc.c:121
 msgid "Channel:"
 msgstr "�:"
 
-#: src/protocols/irc/irc.c:180
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
-#: src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:159 src/protocols/oscar/oscar.c:684
+#: src/protocols/toc/toc.c:236
 #, c-format
 msgid "Signon: %s"
 msgstr "����: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:168
 msgid "Couldn't create socket"
 msgstr "������ ���� �� ����"
 
@@ -4447,178 +4299,155 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:487
 msgid "IRC Protocol Plugin"
 msgstr "IRC �������� �÷�����"
 
 #. *  summary
-#: src/protocols/irc/irc.c:531
+#: src/protocols/irc/irc.c:488
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "�� �� ���� IRC �������� �÷�����"
 
-#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
+#. Splits
+#: src/protocols/irc/irc.c:505 src/protocols/irc/msgs.c:199
+#: src/protocols/jabber/jabber.c:4422 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "����"
 
-#: src/protocols/irc/irc.c:554
+#: src/protocols/irc/irc.c:511
 msgid "Encoding"
 msgstr "���ڵ�"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:101
 msgid "Bad mode"
 msgstr "�߸��� ���"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:112
 #, c-format
 msgid "You are banned from %s."
 msgstr "%s���� ��Ǿ����ϴ�."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:113
 msgid "Banned"
 msgstr "���"
 
-#: src/protocols/irc/msgs.c:184
+#: src/protocols/irc/msgs.c:186
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:185
+#: src/protocols/irc/msgs.c:187
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
+#: src/protocols/irc/msgs.c:193
 msgid "Username"
 msgstr "������̸�"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:1482
 msgid "Realname"
 msgstr "�����̸�"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:204
 msgid "Currently on"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:209
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>�ڸ����:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:211
 msgid "Online since"
 msgstr "���� �ñ�"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:214
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:219
-#, fuzzy, c-format
-msgid "Buddy Information for %s"
-msgstr "�߰�����"
-
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:245
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s���� ������ �ٲ�: %s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:250
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:264
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "'%s'��(��) �� �� ���� �޽����Դϴ�."
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:265
 msgid "Unknown message"
 msgstr "�� �� ���� �޽���"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:265
 msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "������ IRC ������ ���� �޽����� ������ �� �����ϴ�."
+msgstr "������ IRC ������ ���� �޽����� ������ �� �����ϴ�."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:369
 msgid "no such channel"
 msgstr "�׷� ä���� ����"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:372
 msgid "User is not logged in"
 msgstr "���ӵ��� ����"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:377
 msgid "No such nick or channel"
 msgstr "�׷� ��ȭ���̳� ä���� ����"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:397
 msgid "Could not send"
 msgstr "���� �� ����"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:453
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s���� �ʴ�޾ƾ� �� �� �ֽ��ϴ�."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:454
 msgid "Invitation only"
 msgstr "�ʴ��ڸ�"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:550
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s�Կ��� ��������Ǿ����ϴ�: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:558
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s�Կ��� ���������(%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:579
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:660
-#, fuzzy
-msgid "Could not change nick"
-msgstr "������ �� �����ϴ�."
-
-#: src/protocols/irc/msgs.c:661
-msgid "Cannot change nick"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:667
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "%s%s ��� ������"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:705
 msgid "Error: invalid PONG from server"
 msgstr "����: �������� �߸��� PONG�� ����"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:707
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:792
-#, fuzzy, c-format
-msgid "Cannot join %s:"
-msgstr "%s�� ���� �ٲٱ�:"
-
-#: src/protocols/irc/msgs.c:793
-#, fuzzy
-msgid "Cannot join channel"
-msgstr "�׷� ä���� ����"
-
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:795
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:158
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4626,165 +4455,282 @@
 "(�� �޽������� ��ȯ ������ �߻��߽��ϴ�.  ���� �����⿡�� '���ڵ�' �ɼ��� Ȯ"
 "���ϼ���.)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:273
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:274
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:274
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:373
 msgid "Disconnected"
 msgstr "������"
 
-#: src/protocols/jabber/auth.c:50
-msgid "Server requires SSL for login"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
-#: src/protocols/jabber/auth.c:354
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "�����κ��� ��ȿ���� ���� ������ �Խ��ϴ�."
-
-#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
-msgid "Server does not use any supported authentication method"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:327
-#, fuzzy
-msgid "Invalid challenge from server"
-msgstr "�����κ��� ��ȿ���� ���� ������ �Խ��ϴ�."
-
-#: src/protocols/jabber/auth.c:357
-#, fuzzy
-msgid "Bad Protocol"
-msgstr "��������"
-
-#: src/protocols/jabber/auth.c:360
-msgid "Encryption Required"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:363
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:366
-#, fuzzy
-msgid "Invalid Mechanism"
-msgstr "�߸��� ����� �̸�"
-
-#: src/protocols/jabber/auth.c:368
-#, fuzzy
-msgid "Invalid Realm"
-msgstr "�߸��� ����� �̸�"
-
-#: src/protocols/jabber/auth.c:371
-msgid "Mechanism Too Weak"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
-#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
-#: src/protocols/oscar/oscar.c:5472
+#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
+#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
+#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:73
+#: src/protocols/msn/msn.c:93 src/protocols/msn/msn.c:151
+#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:618 src/protocols/msn/msn.c:634
+#: src/protocols/msn/msn.c:669 src/protocols/msn/msn.c:685
+#: src/protocols/msn/msn.c:717 src/protocols/msn/msn.c:725
+#: src/protocols/msn/msn.c:758 src/protocols/msn/msn.c:766
+#: src/protocols/msn/msn.c:780 src/protocols/msn/msn.c:789
+#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:877 src/protocols/msn/msn.c:915
+#: src/protocols/msn/msn.c:1012 src/protocols/msn/msn.c:1034
+#: src/protocols/msn/msn.c:1054 src/protocols/msn/msn.c:1065
+#: src/protocols/msn/msn.c:1076 src/protocols/msn/msn.c:1100
+#: src/protocols/msn/msn.c:1112 src/protocols/msn/notification.c:127
+#: src/protocols/msn/notification.c:154 src/protocols/msn/notification.c:946
+#: src/protocols/msn/notification.c:966 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
+#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
+#: src/protocols/trepia/trepia.c:1263
+msgid "Write error"
+msgstr "���� ����"
+
+#: src/protocols/jabber/jabber.c:979 src/protocols/jabber/jabber.c:986
+msgid "Unable to change password."
+msgstr "��й�ȣ�� �ٲ� �� �����ϴ�."
+
+#: src/protocols/jabber/jabber.c:980
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+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 ""
+
+#. once again, we don't have to put anything here
+#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3489
+msgid "Chatty"
+msgstr "äƼ"
+
+#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3497
+msgid "Extended Away"
+msgstr "�ڸ����"
+
+#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3441
+#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:4585 src/protocols/oscar/oscar.c:5876
+msgid "Do Not Disturb"
+msgstr "���ر���"
+
+#: src/protocols/jabber/jabber.c:1423
+#, c-format
+msgid "Jabber Error %s"
+msgstr "��� %s ����"
+
+#: src/protocols/jabber/jabber.c:1530
+#, c-format
+msgid "Error %s: %s"
+msgstr "%s ����: %s"
+
+#: src/protocols/jabber/jabber.c:1533
+msgid "Unknown Error in presence"
+msgstr "�� �� ���� ���� �߻�"
+
+#: src/protocols/jabber/jabber.c:1711
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "%s���� ���� �ڽ��� ģ�� ��Ͽ� ����Ϸ��� �մϴ�."
+
+#: src/protocols/jabber/jabber.c:1739
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1742
+msgid "No such user."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1906
+msgid "Authenticating"
+msgstr "���� Ȯ�� ��"
+
+#: src/protocols/jabber/jabber.c:1940
+msgid "Unknown login error"
+msgstr "�� �� ���� �α� ����"
+
+#: src/protocols/jabber/jabber.c:2290
+msgid "Password successfully changed."
+msgstr "��й�ȣ�� ���������� �ٲپ����ϴ�."
+
+#: src/protocols/jabber/jabber.c:2335 src/protocols/jabber/jabber.c:4240
+msgid "Connection lost"
+msgstr "���� ����"
+
+#: src/protocols/jabber/jabber.c:2337 src/protocols/jabber/jabber.c:2371
+#: src/protocols/jabber/jabber.c:4242 src/protocols/jabber/jabber.c:4291
+#: src/protocols/msn/dispatch.c:160 src/protocols/msn/msn.c:461
+#: src/protocols/msn/notification.c:1380 src/protocols/napster/napster.c:465
+#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:959
+msgid "Unable to connect"
+msgstr "������ �� �����ϴ�"
+
+#: src/protocols/jabber/jabber.c:2342
+msgid "Connected"
+msgstr "����"
+
+#: src/protocols/jabber/jabber.c:2345
+msgid "Requesting Authentication Method"
+msgstr "���� ��� ��û"
+
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:452 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:982
+msgid "Connecting"
+msgstr "���� ��"
+
+#: src/protocols/jabber/jabber.c:2691
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2693
+msgid "Unable to add buddy."
+msgstr "ģ���� ���� �� �����ϴ�."
+
+#: src/protocols/jabber/jabber.c:2694
+msgid "Jabber Error"
+msgstr "��� ����"
+
+#: src/protocols/jabber/jabber.c:2953
+msgid "Room:"
+msgstr "��ȭ��:"
+
+#: src/protocols/jabber/jabber.c:2958
+msgid "Server:"
+msgstr "����:"
+
+#: src/protocols/jabber/jabber.c:2964
+msgid "Handle:"
+msgstr "ó��:"
+
+#: src/protocols/jabber/jabber.c:2994
+msgid "Unable to join chat"
+msgstr "��ȭ�� ������ �� ����"
+
+#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3699
+msgid "Jabber ID"
+msgstr "��� ���̵�"
+
+#: src/protocols/jabber/jabber.c:3231
+msgid "Error"
+msgstr "����"
+
+#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3725
+msgid "Status"
+msgstr "����"
+
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
+#: src/protocols/oscar/oscar.c:5491
 msgid "Not Authorized"
 msgstr "���� �ȵ�"
 
-#: src/protocols/jabber/auth.c:377
-#, fuzzy
-msgid "Temporary Authentication Failure"
-msgstr "���� ����."
-
-#: src/protocols/jabber/auth.c:379
-#, fuzzy
-msgid "Authentication Failure"
-msgstr "���� ����."
-
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/jabber.c:3387
+msgid "View Error Msg"
+msgstr "���� �޽��� ����"
+
+#: src/protocols/jabber/jabber.c:3406
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3409
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3416
+msgid "Cancel Presence Notification"
+msgstr "���� ǥ�� ���"
+
+#: src/protocols/jabber/jabber.c:3424 src/protocols/oscar/oscar.c:5937
+msgid "Re-request authorization"
+msgstr "���� ���û"
+
+#: src/protocols/jabber/jabber.c:3627
 msgid "Full Name"
 msgstr "�̸�"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/jabber.c:3628
 msgid "Family Name"
 msgstr "��"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/jabber.c:3629
 msgid "Given Name"
 msgstr "�̸�"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
-#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/jabber.c:3630 src/protocols/yahoo/yahoo.c:1478
 msgid "Nickname"
 msgstr "��ȭ��"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/jabber.c:3632
 msgid "Street Address"
 msgstr "�Ÿ� �ּ�"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/jabber.c:3633
 msgid "Extended Address"
 msgstr "������ �ּ�"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/jabber.c:3634
 msgid "Locality"
 msgstr "��ġ"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/jabber.c:3635
 msgid "Region"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
-#: src/protocols/jabber/jabber.c:584
+#: src/protocols/jabber/jabber.c:3636
 msgid "Postal Code"
 msgstr "������ȣ"
 
-#. Country
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
-#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
-msgid "Country"
-msgstr "����"
-
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
-#: src/protocols/jabber/buddy.c:694
+#: src/protocols/jabber/jabber.c:3638
 msgid "Telephone"
 msgstr "��ȭ"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2669
-msgid "Email"
-msgstr "����"
-
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/jabber.c:3640
 msgid "Organization Name"
 msgstr "��� �̸�"
 
-#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/jabber.c:3641
 msgid "Organization Unit"
 msgstr "��� �μ�"
 
-#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/jabber.c:3642
 msgid "Title"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/jabber.c:3643
 msgid "Role"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/jabber/jabber.c:3644 src/protocols/oscar/oscar.c:3986
 msgid "Birthday"
 msgstr "�������"
 
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/jabber.c:4102 src/protocols/jabber/jabber.c:4103
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard ��ġ��"
 
-#: src/protocols/jabber/buddy.c:516
+#: src/protocols/jabber/jabber.c:4104
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4792,359 +4738,18 @@
 "������ ��� �׸��� ���û����Դϴ�. �Է��ص� �����ϴٰ� �����ϴ� ������ �Է���"
 "����."
 
-#: src/protocols/jabber/buddy.c:554
-msgid "Jabber ID"
-msgstr "��� ���̵�"
-
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
-#: src/protocols/jabber/jabber.c:856
-msgid "Status"
-msgstr "����"
-
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
-msgid "Resource"
-msgstr "�ڿ�"
-
-#: src/protocols/jabber/buddy.c:624
-msgid "Middle Name"
-msgstr "�߰� �̸�"
-
-#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
-#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
-msgid "Address"
-msgstr "�Ÿ� �ּ�"
-
-#: src/protocols/jabber/buddy.c:651
-msgid "P.O. Box"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:757
-#, fuzzy
-msgid "Photo"
-msgstr "��Ʈ"
-
-#: src/protocols/jabber/buddy.c:757
-#, fuzzy
-msgid "Logo"
-msgstr "�α�"
-
-#: src/protocols/jabber/buddy.c:771
-#, fuzzy
-msgid "Jabber Profile"
-msgstr "������ ����"
-
-#: src/protocols/jabber/buddy.c:866
-msgid "Un-hide From"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:869
-msgid "Temporarily Hide From"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:877
-msgid "Cancel Presence Notification"
-msgstr "���� ǥ�� ���"
-
-#: src/protocols/jabber/buddy.c:885
-msgid "Re-request authorization"
-msgstr "���� ���û"
-
-#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "��ȭ��:"
-
-#: src/protocols/jabber/chat.c:43
-msgid "Server:"
-msgstr "����:"
-
-#: src/protocols/jabber/chat.c:49
-msgid "Handle:"
-msgstr "ó��:"
-
-#: src/protocols/jabber/jabber.c:80
-msgid "Error initializing session"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:105
-msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:107
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:110
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "�ڿ�"
-
-#: src/protocols/jabber/jabber.c:112
-#, fuzzy
-msgid "Connection Timeout"
-msgstr "������ ����"
-
-#: src/protocols/jabber/jabber.c:114
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:116
-#, fuzzy
-msgid "Host Unknown"
-msgstr "�˷����� ����"
-
-#: src/protocols/jabber/jabber.c:118
-#, fuzzy
-msgid "Improper Addressing"
-msgstr "�� �ּ�"
-
-#: src/protocols/jabber/jabber.c:120
-#, fuzzy
-msgid "Internal Server Error"
-msgstr "���� ���� ����"
-
-#: src/protocols/jabber/jabber.c:122
-#, fuzzy
-msgid "Invalid ID"
-msgstr "�߸��� �����"
-
-#: src/protocols/jabber/jabber.c:124
-#, fuzzy
-msgid "Invalid Namespace"
-msgstr "�߸��� �����"
-
-#: src/protocols/jabber/jabber.c:126
-#, fuzzy
-msgid "Invalid XML"
-msgstr "�߸��� �����"
-
-#: src/protocols/jabber/jabber.c:128
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:132
-msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:134
-#, fuzzy
-msgid "Remote Connection Failed"
-msgstr "������"
-
-#: src/protocols/jabber/jabber.c:136
-#, fuzzy
-msgid "Resource Constraint"
-msgstr "������"
-
-#: src/protocols/jabber/jabber.c:138
-msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:140
-msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:142
-#, fuzzy
-msgid "System Shutdown"
-msgstr "�ý��� �α�"
-
-#: src/protocols/jabber/jabber.c:144
-msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:146
-msgid "Unsupported Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:148
-msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:150
-msgid "Unsupported Version"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:152
-msgid "XML Not Well Formed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:154
-#, fuzzy
-msgid "Stream Error"
-msgstr "���� ����"
-
-#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
-#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
-#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
-#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
-#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
-#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
-#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
-#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
-#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1074
-#: src/protocols/msn/msn.c:1095 src/protocols/msn/msn.c:1106
-#: src/protocols/msn/msn.c:1117 src/protocols/msn/msn.c:1141
-#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1218
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1655 src/protocols/msn/notification.c:1675
-#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
-#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
-#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
-msgid "Write error"
-msgstr "���� ����"
-
-#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
-#, fuzzy
-msgid "Read Error"
-msgstr "�б� ����"
-
-#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
-#: src/protocols/trepia/trepia.c:1106
-msgid "Unable to create socket"
-msgstr "������ ���� �� ����"
-
-#: src/protocols/jabber/jabber.c:419
-#, fuzzy, c-format
-msgid "Registration of %s@%s successful"
-msgstr "������ ���������� ����߽��ϴ�!"
-
-#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
-#, fuzzy
-msgid "Registration Successful"
-msgstr "������ ���������� ����߽��ϴ�!"
-
-#: src/protocols/jabber/jabber.c:431
-#, fuzzy
-msgid "Unknown Error"
-msgstr "�� �� ���� ����"
-
-#: src/protocols/jabber/jabber.c:434
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
-#, fuzzy
-msgid "Registration Failed"
-msgstr "���� ����"
-
-#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
-#, fuzzy
-msgid "Already Registered"
-msgstr "�̹� ����"
-
-#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
-#, fuzzy
-msgid "Password"
-msgstr "��й�ȣ:"
-
-#: src/protocols/jabber/jabber.c:549
-#, fuzzy
-msgid "E-Mail"
-msgstr "����"
-
-#. First Name
-#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
-#: src/protocols/trepia/trepia.c:258
-msgid "First Name"
-msgstr "��"
-
-#. State
-#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
-#: src/protocols/trepia/trepia.c:430
-msgid "State"
-msgstr "��/��"
-
-#: src/protocols/jabber/jabber.c:589
-#, fuzzy
-msgid "Phone"
-msgstr "�������� ����"
-
-#: src/protocols/jabber/jabber.c:607
-msgid "Please fill out the information below to register your new account."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
-msgid "Register New Jabber Account"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
-#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1923
-msgid "Connecting"
-msgstr "���� ��"
-
-#: src/protocols/jabber/jabber.c:714
-msgid "Initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:720
-msgid "Authenticating"
-msgstr "���� Ȯ�� ��"
-
-#: src/protocols/jabber/jabber.c:728
-msgid "Re-initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
-#: src/protocols/jabber/presence.c:257
-msgid "Error"
-msgstr "����"
-
-#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
-#: src/protocols/jabber/presence.c:79
-msgid "Chatty"
-msgstr "äƼ"
-
-#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
-#: src/protocols/jabber/presence.c:84
-msgid "Extended Away"
-msgstr "�ڸ����"
-
-#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
-#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
-#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
-msgid "Do Not Disturb"
-msgstr "���ر���"
-
-#: src/protocols/jabber/jabber.c:884
-#, fuzzy
-msgid "Password Changed"
-msgstr "��й�ȣ�� ���������� �ٲپ���"
-
-#: src/protocols/jabber/jabber.c:885
-#, fuzzy
-msgid "Your password has been changed."
-msgstr "��й�ȣ�� �ٲ� �� �����ϴ�."
-
-#: src/protocols/jabber/jabber.c:895
-#, fuzzy, c-format
-msgid "Error changing password: %s"
-msgstr "��й�ȣ �ٲٱ�(%s):"
-
-#: src/protocols/jabber/jabber.c:899
-#, fuzzy
-msgid "Unknown error occurred changing password"
-msgstr "��й�ȣ�� �ٲ� �� �����ϴ�."
-
-#: src/protocols/jabber/jabber.c:956
-#, fuzzy
-msgid "Password (again)"
-msgstr "�� ��й�ȣ Ȯ��"
-
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
-#, fuzzy
-msgid "Change Jabber Password"
-msgstr "��й�ȣ �ٲٱ�"
-
-#: src/protocols/jabber/jabber.c:962
-#, fuzzy
-msgid "Please enter your new password"
-msgstr "��й�ȣ�� �Է��ϼ���"
+#: src/protocols/jabber/jabber.c:4177
+msgid "Server Registration successful!"
+msgstr "������ ����� �����߽��ϴ�!"
+
+#: src/protocols/jabber/jabber.c:4193
+#, c-format
+msgid "Error %d: %s"
+msgstr "%d ����: %s"
+
+#: src/protocols/jabber/jabber.c:4198
+msgid "Unknown registration error"
+msgstr "�� �� ���� ���� ����"
 
 #. *< api_version
 #. *< type
@@ -5156,133 +4761,70 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
+#: src/protocols/jabber/jabber.c:4401 src/protocols/jabber/jabber.c:4403
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber �������� �÷�����"
 
-#: src/protocols/jabber/jabber.c:1083
-msgid "Force Old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:4425
+msgid "Resource"
+msgstr "�ڿ�"
+
+#: src/protocols/jabber/jabber.c:4433
 msgid "Connect server"
 msgstr "���� ����"
 
-#: src/protocols/jabber/message.c:95
-#, fuzzy, c-format
-msgid "Message from %s"
-msgstr "�޽��� �α�"
-
-#: src/protocols/jabber/message.c:178
-#, c-format
-msgid "Message delivery to %s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/message.c:181
-#, fuzzy
-msgid "Jabber Message Error"
-msgstr "��� ����"
-
-#: src/protocols/jabber/message.c:244
-#, c-format
-msgid " (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/parser.c:129
-#, fuzzy
-msgid "XML Parse error"
-msgstr "���� ����"
-
-#: src/protocols/jabber/presence.c:167
-#, c-format
-msgid "%s (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:172
-msgid "Unknown Error in presence"
-msgstr "�� �� ���� ���� �߻�"
-
-#: src/protocols/jabber/presence.c:176
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "%s���� ���� �ڽ��� ģ�� ��Ͽ� ����Ϸ��� �մϴ�."
-
-#: src/protocols/jabber/presence.c:253
-msgid "Unable to join chat"
-msgstr "��ȭ�� ������ �� ����"
-
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:509
-#, fuzzy
-msgid "Unable to request USR\n"
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:226
+msgid "Protocol not supported"
+msgstr "�������� �ʴ� ��������"
+
+#: src/protocols/msn/dispatch.c:51 src/protocols/msn/notification.c:232
+msgid "Unable to request INF"
 msgstr "INF ��û �Ұ���"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:249
 msgid "Unable to login using MD5"
 msgstr "MD5�� ����ؼ� ������ �� ����"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:77 src/protocols/msn/notification.c:258
 msgid "Unable to send USR"
 msgstr "USR�� ���� �� ����"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:263
 msgid "Requesting to send password"
 msgstr "��й�ȣ�� ������ ��"
 
-#: src/protocols/msn/dispatch.c:104
-#, fuzzy
-msgid "Protocol version not supported"
-msgstr "�������� �ʴ� ��������"
-
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:771
-#, fuzzy
-msgid "Unable to request CVR\n"
-msgstr "INF ��û �Ұ���"
-
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:780
-#, fuzzy
-msgid "Unable to request INF\n"
-msgstr "INF ��û �Ұ���"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1889
+#: src/protocols/msn/dispatch.c:99 src/protocols/msn/notification.c:1165
 msgid "Got invalid XFR"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:178
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to transfer"
 msgstr "������ �� ����"
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:147
 msgid "Unable to parse message."
 msgstr "�޽����� �м��� �� �����ϴ�."
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
-#: src/protocols/msn/notification.c:2116 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
-msgid "Unable to connect"
-msgstr "������ �� �����ϴ�"
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:876
-#: src/protocols/msn/notification.c:2138
+#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:404
+#: src/protocols/msn/notification.c:1389
 msgid "Unable to write to server"
 msgstr "������ �����͸� ���� �� ����"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2145
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1396
 msgid "Syncing with server"
 msgstr "������ ����ȭ"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2159
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1410
 msgid "Error reading from server"
 msgstr "�������� �д� �� ������ �߻��߽��ϴ�."
 
 #: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "���� ���� (������ ������ �� ����)"
+msgstr "���� ���� (������ ������ �� ����)"
 
 #: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "�߸��� �Ķ���� (������ ������ �� ����)"
+msgstr "�߸��� �Ķ���� (������ ������ �� ����)"
 
 #: src/protocols/msn/error.c:40
 msgid "Invalid User"
@@ -5293,9 +4835,8 @@
 msgstr "������ �̸��� ������"
 
 #: src/protocols/msn/error.c:47
-#, fuzzy
-msgid "Already Logged In"
-msgstr "�̹� �α��εǾ� ����"
+msgid "Already Login"
+msgstr "�̹� �α��"
 
 #: src/protocols/msn/error.c:50
 msgid "Invalid Username"
@@ -5329,191 +4870,150 @@
 msgid "Already in opposite list"
 msgstr "�̹� �ݴ� ��Ͽ� ����"
 
-#: src/protocols/msn/error.c:74
-#, fuzzy
-msgid "Too many groups"
-msgstr "������ �ʹ� �����ϴ�."
-
-#: src/protocols/msn/error.c:77
-#, fuzzy
-msgid "Invalid group"
-msgstr "�߸��� �׷� �̸�"
-
-#: src/protocols/msn/error.c:80
-msgid "User not in group"
-msgstr ""
-
-#: src/protocols/msn/error.c:83
-#, fuzzy
-msgid "Group name too long"
-msgstr "���������� �ʹ� ��ϴ�."
-
-#: src/protocols/msn/error.c:86
-msgid "Cannot remove group zero"
-msgstr ""
-
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:75
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr ""
 
-#: src/protocols/msn/error.c:94
+#: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
 msgstr "����ġ���� ����"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
 msgstr "���� �˸� ����"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:86
 msgid "Required fields missing"
 msgstr "�ʼ� �׸��� ������"
 
-#: src/protocols/msn/error.c:104
-msgid "Too many hits to a FND"
-msgstr ""
-
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "���ӵ��� ����"
 
-#: src/protocols/msn/error.c:111
+#: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr "���� ���� ����"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:96
 msgid "Database server error"
 msgstr "�����ͺ��̽� ���� ����"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:99
 msgid "File operation error"
 msgstr "���� ó�� ����"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:102
 msgid "Memory allocation error"
 msgstr "�޸� �Ҵ� ����"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:105
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr "���� �ٻ�"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:112
 msgid "Server unavailable"
 msgstr "������ ������ �� ����"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
 msgstr "�Ǿ� �˸� ������ �ٿ��"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:118
 msgid "Database connect error"
 msgstr "�����ͺ��̽� ���� ����"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
 msgstr "������ �� �ٿ��"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:126
 msgid "Error creating connection"
 msgstr "������ ���� �߻�"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:130
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:623
-#: src/protocols/msn/notification.c:1269 src/protocols/msn/notification.c:1437
+#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:289
+#: src/protocols/msn/notification.c:757
 msgid "Unable to write"
 msgstr "�� �� �����ϴ�."
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "���� ���ϰ� �ʹ� ŭ"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:139
 msgid "User is too active"
 msgstr "����ڰ� �ʹ� Ȱ������"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr "������ �ʹ� �����ϴ�."
 
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:145
 msgid "Not expected"
 msgstr "����ġ ����"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:148
 msgid "Bad friend file"
 msgstr "�߸��� ģ�� ����"
 
-#: src/protocols/msn/error.c:177
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-#: src/protocols/msn/error.c:186
-#, fuzzy
-msgid "Server too busy"
-msgstr "���� �ٻ�"
-
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:152 src/protocols/oscar/oscar.c:1085
+#: src/protocols/toc/toc.c:661
 msgid "Authentication failed"
 msgstr "���� ����."
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:155
 msgid "Not allowed when offline"
 msgstr "���������� �� ��� ����"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:158
 msgid "Not accepting new users"
 msgstr "���ο� ����ڸ� ������� ����"
 
-#: src/protocols/msn/error.c:205
-msgid "Kids Passport without parental consent"
-msgstr ""
-
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:162
 msgid "Passport account not yet verified"
 msgstr "�н���Ʈ ������ ���� �������� ����"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:166
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "�� �� ���� ���� �ڵ� %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/msn.c:61
 msgid "Your new MSN friendly name is too long."
 msgstr "���ο� MSN ��ȭ���� �ʹ� ��ϴ�."
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:168
 msgid "Set your friendly name."
 msgstr "��ȭ�� �Է��ϼ���."
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:169
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�̰��� �ٸ� MSN ģ���鿡�� �������� �̸��Դϴ�."
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:181
 msgid "Set your home phone number."
 msgstr "�� ��ȭ��ȣ�� �����ʽÿ�."
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:192
 msgid "Set your work phone number."
 msgstr "���� ��ȭ��ȣ�� �����ʽÿ�."
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:203
 msgid "Set your mobile phone number."
 msgstr "�ڵ��� ��ȣ�� �����ʽÿ�."
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:212
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN ȣ���� ����ұ��?"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:213
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5521,181 +5021,172 @@
 "�� ģ�� ����� ������� �ڵ����̳� �ٸ� ����� ���� MSN ȣ���� �������� ��"
 "���ϰڽ��ϱ�?"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:217
 msgid "Allow"
 msgstr "���"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:218
 msgid "Disallow"
 msgstr "�Ұ�"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:235
 msgid "Send a mobile message."
 msgstr "���� �޽����� �����ϴ�."
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:237
 msgid "Page"
 msgstr "������"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:326 src/protocols/yahoo/yahoo.c:1122
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>����:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:594
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "�ڸ����"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:596
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1049
+#: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1335
 msgid "Be Right Back"
 msgstr "�� ���ƿ�"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:598
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1051
+#: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1336
 msgid "Busy"
 msgstr "�ٸ� �빫 ��"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:600
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1059
+#: src/protocols/yahoo/yahoo.c:1269 src/protocols/yahoo/yahoo.c:1340
 msgid "On The Phone"
 msgstr "��ȭ ��"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:602
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1063
+#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1342
 msgid "Out To Lunch"
 msgstr "������� ��"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:344 src/protocols/msn/msn.c:604
+#: src/protocols/zephyr/zephyr.c:861 src/protocols/zephyr/zephyr.c:876
 msgid "Hidden"
 msgstr "����"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:356
 msgid "Set Friendly Name"
 msgstr "��ȭ�� �Է�"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:364
 msgid "Set Home Phone Number"
 msgstr "�� ��ȭ��ȣ �Է�"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:370
 msgid "Set Work Phone Number"
 msgstr "���� ��ȭ��ȣ �Է�"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:376
 msgid "Set Mobile Phone Number"
 msgstr "�ڵ��� ��ȣ ����"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:385
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:392
 msgid "Allow/Disallow Mobile Pages"
 msgstr "ȣ�� ���/�Ұ�"
 
+#: src/protocols/msn/msn.c:415
+msgid "Send to Mobile"
+msgstr "�ڵ������� ������"
+
 #: src/protocols/msn/msn.c:424
-msgid "Send to Mobile"
-msgstr "�ڵ������� ������"
-
-#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "� ����"
 
-#: src/protocols/msn/msn.c:727
+#: src/protocols/msn/msn.c:698
 #, 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:731 src/protocols/msn/msn.c:771
+#: src/protocols/msn/msn.c:702 src/protocols/msn/msn.c:742
 msgid "Invalid MSN screenname"
 msgstr "�߸��� MSN ���̵�"
 
-#: src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:738
 #, 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/msn/msn.c:1242 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1170 src/protocols/yahoo/yahoo.c:1408
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1310 src/protocols/oscar/oscar.c:3931
-#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/msn/msn.c:1218 src/protocols/oscar/oscar.c:3991
+#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
+#: src/protocols/yahoo/yahoo.c:1490
 msgid "Age"
 msgstr "����"
 
 #. Gender
-#: src/protocols/msn/msn.c:1317 src/protocols/oscar/oscar.c:3917
-#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
-#: src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:1222 src/protocols/oscar/oscar.c:3977
+#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
+#: src/protocols/yahoo/yahoo.c:1498
 msgid "Gender"
 msgstr "����"
 
-#: src/protocols/msn/msn.c:1325 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1226 src/protocols/yahoo/yahoo.c:1494
 msgid "Marital Status"
 msgstr "��ȥ����"
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1230 src/protocols/yahoo/yahoo.c:1486
 msgid "Location"
 msgstr "��ġ"
 
-#: src/protocols/msn/msn.c:1340 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1234 src/protocols/yahoo/yahoo.c:1502
 msgid "Occupation"
 msgstr "����"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/msn/msn.c:1363
-#: src/protocols/msn/msn.c:1370 src/protocols/msn/msn.c:1377
-#: src/protocols/msn/msn.c:1384
+#: src/protocols/msn/msn.c:1244 src/protocols/msn/msn.c:1246
+#: src/protocols/msn/msn.c:1248 src/protocols/msn/msn.c:1250
+#: src/protocols/msn/msn.c:1252
 msgid "A Little About Me"
 msgstr "�Ұ�"
 
-#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1406
-#: src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1256 src/protocols/msn/msn.c:1260
+#: src/protocols/msn/msn.c:1262
 msgid "Favorite Things"
 msgstr "�����ϴ� ��"
 
-#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1428
-#: src/protocols/msn/msn.c:1435
+#: src/protocols/msn/msn.c:1266 src/protocols/msn/msn.c:1268
+#: src/protocols/msn/msn.c:1270
 msgid "Hobbies and Interests"
 msgstr "���/���"
 
-#: src/protocols/msn/msn.c:1444 src/protocols/msn/msn.c:1450
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1274 src/protocols/msn/msn.c:1276
+#: src/protocols/yahoo/yahoo.c:1522
 msgid "Favorite Quote"
 msgstr "�����ϴ� ����"
 
-#: src/protocols/msn/msn.c:1458 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1280 src/protocols/yahoo/yahoo.c:1551
 msgid "Last Updated"
 msgstr "���� ����"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1469 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:448
+#: src/protocols/msn/msn.c:1285 src/protocols/trepia/trepia.c:321
+#: src/protocols/trepia/trepia.c:489
 msgid "Homepage"
 msgstr "Ȩ������"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/yahoo/yahoo.c:2817
-#, fuzzy, c-format
-msgid "User information for %s unavailable"
-msgstr "%s���� ����� ������ ������ �� ����:"
-
-#: src/protocols/msn/msn.c:1493 src/protocols/yahoo/yahoo.c:2819
-msgid "The user's profile is empty."
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5706,85 +5197,54 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1371 src/protocols/msn/msn.c:1373
 msgid "MSN Protocol Plugin"
 msgstr "MSN �������� �÷�����"
 
-#: src/protocols/msn/msn.c:1612 src/protocols/trepia/trepia.c:1330
+#: src/protocols/msn/msn.c:1390 src/protocols/trepia/trepia.c:1371
 msgid "Login server"
 msgstr "��� ����"
 
-#: src/protocols/msn/notification.c:247
+#: src/protocols/msn/notification.c:194
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN ����: %s\n"
 
-#: src/protocols/msn/notification.c:366 src/protocols/msn/notification.c:534
-#, fuzzy
-msgid "Unable to write to MSN Nexus server."
-msgstr "������ �����͸� ���� �� ����"
-
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:549
-#, fuzzy
-msgid "Unable to read from MSN Nexus server."
-msgstr "�������� ����� ���� �� ����"
-
-#: src/protocols/msn/notification.c:395
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr ""
-
-#: src/protocols/msn/notification.c:448
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr ""
-
-#: src/protocols/msn/notification.c:560
-msgid "MSN Nexus server returned invalid information."
-msgstr ""
-
-#: src/protocols/msn/notification.c:628 src/protocols/trepia/trepia.c:677
+#: src/protocols/msn/notification.c:294 src/protocols/trepia/trepia.c:718
 msgid "Retrieving buddy list"
 msgstr "ģ�� ��� ��ȯ"
 
-#: src/protocols/msn/notification.c:690
-#, fuzzy
-msgid "Unable to connect to passport server"
-msgstr "������ ������ �� �����ϴ�."
-
-#: src/protocols/msn/notification.c:695 src/protocols/msn/notification.c:727
-msgid "Password sent"
-msgstr "��й�ȣ ����"
-
-#: src/protocols/msn/notification.c:722
+#: src/protocols/msn/notification.c:320
 msgid "Unable to send password"
 msgstr "��й�ȣ�� ���� �� ����"
 
-#: src/protocols/msn/notification.c:758
-msgid "Protocol not supported"
-msgstr "�������� �ʴ� ��������"
-
-#: src/protocols/msn/notification.c:800
+#: src/protocols/msn/notification.c:325
+msgid "Password sent"
+msgstr "��й�ȣ ����"
+
+#: src/protocols/msn/notification.c:343
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "�ٸ� ������ ���� ���̵�� �α����Ͽ� ������ ������ϴ�."
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:348
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "���� ����Ǿ����ϴ�. MSN ������ �Ͻ������� ������ �Ǿ����ϴ�."
 
-#: src/protocols/msn/notification.c:931
+#: src/protocols/msn/notification.c:459
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "%s(%s)���� %s���� ģ�� ��Ͽ� ����Ϸ��� �մϴ�."
 
-#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1416
+#: src/protocols/msn/notification.c:738
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "%s(%s)���� ���� ģ�� ��Ͽ� ����Ϸ��� �մϴ�"
 
-#: src/protocols/msn/notification.c:1931
+#: src/protocols/msn/notification.c:1207
 msgid "Unable to transfer to notification server"
 msgstr "Notification ������ ������ �� ����"
 
-#: src/protocols/msn/notification.c:2079
+#: src/protocols/msn/notification.c:1345
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5803,63 +5263,63 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/switchboard.c:122
 msgid "The conversation has become inactive and timed out."
 msgstr "��ȭ�� ��Ȱ��ȭ�Ǿ��ų� �ð��� �ʹ� �������ϴ�."
 
-#: src/protocols/msn/switchboard.c:154
+#: src/protocols/msn/switchboard.c:129
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s���� ��ȭâ�� �ݾҽ��ϴ�."
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:251
 msgid "An MSN message may not have been received."
 msgstr "MSN �޽����� ���� �� �����ϴ�."
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:232
 msgid "Unable to read header from server"
 msgstr "�������� ����� ���� �� ����"
 
-#: src/protocols/napster/napster.c:242
-#, fuzzy, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:246
+#, c-format
+msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
 msgstr "�������� �޽����� ���� �� �����ϴ�.  ������ %hd��, ���̴� %hd���Դϴ�."
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "�����: %s, ����: %s, ũ��: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "������ ������ ������ϴ�."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:382
 #, c-format
 msgid "%s requested your information"
 msgstr "%s���� �� ������ ��û����"
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:412
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "�ٸ� ������ ���� ���̵�� �α����Ͽ� ������ ����"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:418
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
-#: src/protocols/toc/toc.c:1258
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5200
+#: src/protocols/toc/toc.c:1236
 msgid "Join what group:"
 msgstr "������ �׷�:"
 
@@ -5873,178 +5333,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
 msgid "NAPSTER Protocol Plugin"
 msgstr "������ �������� �÷�����"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "�߸��� ����"
 
-#: src/protocols/oscar/oscar.c:176
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "�߸��� SNAC"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:178
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:180
-msgid "Service unavailable"
-msgstr "���� �Ұ���"
-
-#: src/protocols/oscar/oscar.c:181
-msgid "Service not defined"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:182
-msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by host"
+msgid "Rate to client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:184
-msgid "Not supported by client"
-msgstr ""
+msgid "Service unavailable"
+msgstr "���� �Ұ���"
 
 #: src/protocols/oscar/oscar.c:185
-msgid "Refused by client"
+msgid "Service not defined"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Reply too big"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Responses lost"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Request denied"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Busted SNAC payload"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Insufficient rights"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "In local permit/deny"
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Too evil (sender)"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Too evil (receiver)"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:194
-msgid "User temporarily unavailable"
-msgstr "����ڰ� �Ͻ������� ����"
+msgid "Insufficient rights"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:195
-msgid "No match"
-msgstr "���� ����"
+msgid "In local permit/deny"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:196
-msgid "List overflow"
-msgstr "��� ��ħ"
+msgid "Too evil (sender)"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Request ambiguous"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "Queue full"
-msgstr ""
+msgid "User temporarily unavailable"
+msgstr "����ڰ� �Ͻ������� ����"
 
 #: src/protocols/oscar/oscar.c:199
+msgid "No match"
+msgstr "���� ����"
+
+#: src/protocols/oscar/oscar.c:200
+msgid "List overflow"
+msgstr "��� ��ħ"
+
+#: src/protocols/oscar/oscar.c:201
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:202
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s���� ���� ������ ������ϴ�"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%s���� ���� ���ῡ �����߽��ϴ�"
 
-#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
-#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
-#: src/protocols/toc/toc.c:709
+#: src/protocols/oscar/oscar.c:536 src/protocols/toc/toc.c:226
+#: src/protocols/toc/toc.c:627 src/protocols/toc/toc.c:643
+#: src/protocols/toc/toc.c:711
 msgid "Disconnected."
 msgstr "������."
 
-#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:548 src/protocols/toc/toc.c:887
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ��ȭ�ǰ��� ������ ������ϴ�."
 
-#: src/protocols/oscar/oscar.c:559
+#: src/protocols/oscar/oscar.c:564
 msgid "Chat is currently unavailable"
 msgstr "������ ä���� �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:638 src/protocols/oscar/oscar.c:695
 msgid "Couldn't connect to host"
 msgstr "ȣ��Ʈ�� ������ �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:675
+#: src/protocols/oscar/oscar.c:680
 msgid "Unable to login to AIM"
 msgstr "AIM�� �α����� �� �����ϴ�"
 
-#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
+#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
 msgid "Could Not Connect"
 msgstr "������ �� �����ϴ�"
 
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:796
 msgid "Connection established, cookie sent"
 msgstr "������ �� ��Ű�� ���½��ϴ�"
 
-#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
-#: src/protocols/oscar/oscar.c:870
+#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "File Transfer Aborted"
 msgstr "���� ���� ���"
 
-#: src/protocols/oscar/oscar.c:853
+#: src/protocols/oscar/oscar.c:864
 msgid "Unable to establish listener socket."
 msgstr "������ ������ ��ȿ���� �ʽ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:877
 msgid "Unable to establish file descriptor."
 msgstr "���� ����ڰ� ��ȿ���� �ʽ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:882
 msgid "Unable to create new connection."
 msgstr "�� ������ ���� �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:573
 msgid "Incorrect nickname or password."
 msgstr "���̵� �н����尡 Ʋ�Ƚ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:1056
+#: src/protocols/oscar/oscar.c:1067
 msgid "Your account is currently suspended."
 msgstr "������ ���� ��� ���� �����Դϴ�."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1071
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �޽��� ���񽺰� ��� ���� �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1076
 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."
@@ -6052,93 +5512,94 @@
 "�ʹ� ���� �����ϰ� ���� �Ͽ����ϴ�. 10���� ��ٸ� �� �ٽ� �õ��Ͻʽÿ�. ��� "
 "�õ��Ѵٸ� ��ٷ��� �ϴ� �ð��� �� ������ϴ�."
 
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1081
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "����ϰ� �ִ� Ŭ���̾�Ʈ�� �ʹ� �����Ǿ����ϴ�. ���� ��ġ���� ���׷��̵��Ͻ�"
 "�ÿ�. %s"
 
-#: src/protocols/oscar/oscar.c:1102
+#: src/protocols/oscar/oscar.c:1113
 msgid "Internal Error"
 msgstr "���� ����"
 
-#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
+#: src/protocols/oscar/oscar.c:1333
 #, 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:1207 src/protocols/oscar/oscar.c:1237
+#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
 msgid "Gaim was Unable to get a valid AIM login hash."
-msgstr "������ ��ȿ�� AIM �α��� �ؽø� ���� �� �����ϴ�."
-
-#: src/protocols/oscar/oscar.c:1325
+msgstr "������ ��ȿ�� AIM �α��� �ؽø� ���� �� �����ϴ�."
+
+#: src/protocols/oscar/oscar.c:1336
 msgid "Gaim was Unable to get a valid login hash."
-msgstr "������ ��ȿ�� �α��� �ؽø� ���� �� �����ϴ�."
-
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
+msgstr "������ ��ȿ�� �α��� �ؽø� ���� �� �����ϴ�."
+
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5591
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s�� ���� �����"
 
-#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:2410
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2406
+#: src/protocols/oscar/oscar.c:2413
 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:2411 src/protocols/oscar/oscar.c:5941
+#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:5752
 msgid "Connect"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2445
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "���� ģ�� ��Ͽ� ����� ���Ϸ��� �մϴ�. ���� �ٶ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2453
 msgid "Authorization Request Message:"
 msgstr "���� ��û �޽���:"
 
-#: src/protocols/oscar/oscar.c:2447
+#: src/protocols/oscar/oscar.c:2454
 msgid "Please authorize me!"
 msgstr "���� �������ּ���!"
 
-#: src/protocols/oscar/oscar.c:2475
+#: src/protocols/oscar/oscar.c:2482
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "%s���� ģ����Ͽ� ���ϱ� ���� ������ �ʿ��մϴ�. ���� ��û�� �������?"
 
-#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
 msgid "Request Authorization"
 msgstr "���� ��û"
 
-#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
-#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2606
+#: src/protocols/oscar/oscar.c:2626 src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3053 src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5167
 msgid "No reason given."
 msgstr "������ �Է����� �ʾҽ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2533
 msgid "Authorization Denied Message:"
 msgstr "���� ���� �޽���:"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2606
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6147,32 +5608,31 @@
 "%u ����ڰ� ���� ������ ���� �ڽ��� ģ�� ��Ͽ� ����Ϸ��� ��:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5127
 msgid "Authorization Request"
 msgstr "���� ��û"
 
-#: src/protocols/oscar/oscar.c:2619
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:2626
+#, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
+"The user %u has denied your request to add them to your contact list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"%u ����ڰ� ģ�� ��Ͽ� �ڽ��� ����ϴ� ���� ������ ���� ������ �����߽���"
-"��: \n"
+"%u ����ڰ� ģ�� ��� ��û�� ������ ���� ������ �����߽��ϴ�: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:2627
 msgid "ICQ authorization denied."
 msgstr "ICQ ������ �źεǾ����ϴ�."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2627
-#, fuzzy, c-format
-msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "%u ����ڰ� ģ�� ��Ͽ� �ڽ��� ����ϴ� ���� �޾Ƶ鿴���ϴ�."
-
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2634
+#, c-format
+msgid "The user %u has granted your request to add them to your contact list."
+msgstr "%u ����ڰ� ģ�� ����� ����߽��ϴ�."
+
+#: src/protocols/oscar/oscar.c:2642
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6185,7 +5645,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2650
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6198,7 +5658,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2658
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6211,33 +5671,32 @@
 "����:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2672
-#, c-format
-msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2678
-#, fuzzy
-msgid "Do you want to add this buddy to your buddy list?"
-msgstr "�� ģ�� ��Ͽ� ���ұ��?"
-
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:2679
+#, c-format
+msgid "ICQ user %u has sent you a contact: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2685
+msgid "Do you want to add this contact to your Buddy List?"
+msgstr "�� ģ�� ��Ͽ� �� ����ó�� ���ұ��?"
+
+#: src/protocols/oscar/oscar.c:2689
 msgid "Decline"
 msgstr "���� ����"
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:2771
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2780
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2789
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6245,171 +5704,194 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:2798
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2807
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2809
+#: src/protocols/oscar/oscar.c:2816
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
-#: src/protocols/oscar/oscar.c:6068
+#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:5879
 msgid "Free For Chat"
 msgstr "��ȭ�� �� ����"
 
-#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
-#: src/protocols/oscar/oscar.c:6066
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4588
+#: src/protocols/oscar/oscar.c:5877
 msgid "Not Available"
 msgstr "����� �� ����"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
-#: src/protocols/oscar/oscar.c:6067
+#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:5878
 msgid "Occupied"
 msgstr "����ϰ� ����"
 
-#: src/protocols/oscar/oscar.c:2835
+#: src/protocols/oscar/oscar.c:2842
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2878
+#: src/protocols/oscar/oscar.c:2902
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>����:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2937
+#: src/protocols/oscar/oscar.c:2904
+#, c-format
+msgid "<B>Status:</B> %s<HR>%s"
+msgstr "<B>����:</B> %s<HR>%s"
+
+#: src/protocols/oscar/oscar.c:2963
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ����: %s\n"
 
-#: src/protocols/oscar/oscar.c:2938
+#: src/protocols/oscar/oscar.c:2964
 msgid "Unknown error"
 msgstr "�� �� ���� ����"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:2999
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�޽����� %s�Կ��� �������� ������:"
 
-#: src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3051
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr "%s���� ����� ������ ������ �� ����:"
+
+#: src/protocols/oscar/oscar.c:3088
 msgid "Voice"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3073
-#, fuzzy
-msgid "AIM Direct IM"
+#: src/protocols/oscar/oscar.c:3091 src/protocols/oscar/oscar.c:5908
+msgid "Direct IM"
 msgstr "���� ����"
 
-#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5924
 msgid "Get File"
 msgstr "���� �ޱ�"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
+#: src/protocols/oscar/oscar.c:3100 src/protocols/oscar/oscar.c:5916
 msgid "Send File"
 msgstr "���� ������"
 
-#: src/protocols/oscar/oscar.c:3086
+#: src/protocols/oscar/oscar.c:3104
 msgid "Games"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3107
 msgid "Add-Ins"
 msgstr "�ֵ���"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3110
 msgid "Send Buddy List"
 msgstr "ģ�� ��� ������"
 
-#: src/protocols/oscar/oscar.c:3095
-#, fuzzy
-msgid "ICQ Direct Connect"
-msgstr "������ �� �����ϴ�"
-
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3113
+msgid "EveryBuddy Bug"
+msgstr "���긮���� ����"
+
+#: src/protocols/oscar/oscar.c:3116
 msgid "AP User"
 msgstr "AP �����"
 
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3119
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3104
-msgid "Nihilist"
-msgstr "�㹫������"
-
-#: src/protocols/oscar/oscar.c:3107
-msgid "ICQ Server Relay"
-msgstr "ICQ ���� ������"
-
-#: src/protocols/oscar/oscar.c:3110
-msgid "Old ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3113
-msgid "Trillian Encryption"
-msgstr "Ʈ������ ��ȣȭ"
-
-#: src/protocols/oscar/oscar.c:3116
-msgid "ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3119
-msgid "Hiptop"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:3122
-msgid "Secure IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3151
+msgid "Nihilist"
+msgstr "�㹫������"
+
+#: src/protocols/oscar/oscar.c:3125
+msgid "ICQ Server Relay"
+msgstr "ICQ ���� ������"
+
+#: src/protocols/oscar/oscar.c:3128
+msgid "ICQ Unknown"
+msgstr "ICQ �˷����� ����"
+
+#: src/protocols/oscar/oscar.c:3131
+msgid "Trillian Encryption"
+msgstr "Ʈ������ ��ȣȭ"
+
+#: src/protocols/oscar/oscar.c:3134
+msgid "ICQ UTF8"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3137
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3177
+msgid ""
+"<i>Unable to display information because it was sent in an unknown encoding."
+"</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3184
+#, c-format
+msgid "Online Since : <b>%s</b><br>\n"
+msgstr "���� �ð� : <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3189
 #, fuzzy, c-format
-msgid "Username: <b>%s</b><br>\n"
+msgid "Member Since : <b>%s</b><br>\n"
 msgstr "<b>�����:</b> %s<br>"
 
-#: src/protocols/oscar/oscar.c:3152
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3155
-#, c-format
-msgid "Online Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3159
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3164
-#, fuzzy, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "<b>�ڸ����:</b> %s<br>"
-
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3195
+#, c-format
+msgid "Idle : <b>%s</b>"
+msgstr "�ڸ����: </b>%s</b>"
+
+#: src/protocols/oscar/oscar.c:3198
 msgid "Idle: <b>Active</b>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3206
+msgstr "�ڸ����: <b>Ȱ��ȭ</b>"
+
+#: src/protocols/oscar/oscar.c:3200
+#, c-format
+msgid ""
+"Username : <b>%s</b>  %s <br>\n"
+"Warning Level : <b>%d %%</b><br>\n"
+"%s%s%s\n"
+"<hr>\n"
+msgstr ""
+"������̸� : <b>%s</b>  %s <br>\n"
+"��� ���� : <b>%d %%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3232
+msgid "<i>User has no away message</i>"
+msgstr "<i>�ڸ���� �޽����� ����</i>"
+
+#: src/protocols/oscar/oscar.c:3243
+msgid "Client Capabilities: "
+msgstr "Ŭ���̾�Ʈ ���: "
+
+#: src/protocols/oscar/oscar.c:3249
+msgid "<i>No Information Provided</i>"
+msgstr "<i>���� ������ ����</i>"
+
+#: src/protocols/oscar/oscar.c:3273
 msgid "Your AIM connection may be lost."
 msgstr "AIM ������ ������ �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:3594
+#: src/protocols/oscar/oscar.c:3660
 msgid "Rate limiting error."
 msgstr "���� �Ѱ� ����."
 
-#: src/protocols/oscar/oscar.c:3595
+#: src/protocols/oscar/oscar.c:3661
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6417,186 +5899,176 @@
 "���� �׼��� ���� �Ѱ踦 �Ѿ �������� �ʾҽ��ϴ�. 10�� �Ŀ� �ٽ� �õ��Ͻʽ�"
 "��."
 
-#: src/protocols/oscar/oscar.c:3656
+#: src/protocols/oscar/oscar.c:3722
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "�ٸ� ������ ���� ���̵�� ������ ������ ������ϴ�."
 
-#: src/protocols/oscar/oscar.c:3658
+#: src/protocols/oscar/oscar.c:3724
 msgid "You have been signed off for an unknown reason."
 msgstr "�� �� ���� ������ ������ ���������ϴ�."
 
-#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
 msgid "Email Address"
 msgstr "���� �ּ�"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:3974
 msgid "Mobile Phone"
 msgstr "�ڵ���"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:313
+#: src/protocols/trepia/trepia.c:454
 msgid "Female"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:312
+#: src/protocols/trepia/trepia.c:454
 msgid "Male"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3994
 msgid "Personal Web Page"
 msgstr "Ȩ������"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:3997
 msgid "Additional Information"
 msgstr "�߰�����"
 
-#: src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:4001
 msgid "Home Address"
 msgstr "�� �ּ�"
 
-#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
+msgid "Address"
+msgstr "�Ÿ� �ּ�"
+
+#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
 msgid "Zip Code"
 msgstr "������ȣ"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:4017
 msgid "Work Address"
 msgstr "���� �ּ�"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:4033
 msgid "Work Information"
 msgstr "���� ����"
 
-#: src/protocols/oscar/oscar.c:3975
+#: src/protocols/oscar/oscar.c:4035
 msgid "Company"
 msgstr "ȸ��"
 
-#: src/protocols/oscar/oscar.c:3978
+#: src/protocols/oscar/oscar.c:4038
 msgid "Division"
 msgstr "��Ʈ"
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:4041
 msgid "Position"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:4044
 msgid "Web Page"
 msgstr "Ȩ������"
 
-#: src/protocols/oscar/oscar.c:3990
-#, fuzzy, c-format
-msgid "ICQ Info for %s"
-msgstr "%s�� ���� �ٲٱ�:"
-
-#: src/protocols/oscar/oscar.c:4040
-#, fuzzy
-msgid "Pop-Up Message"
-msgstr "�� �޽���"
-
-#: src/protocols/oscar/oscar.c:4061
-#, c-format
-msgid "The following screennames are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4065
-msgid "Search Results"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4112
+#, c-format
+msgid "<B>%s has the following screen names:</B><BR>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4130
 #, c-format
 msgid "No results found for email address %s"
 msgstr "%s �ּҷ� ã�� ����� ����"
 
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/oscar/oscar.c:4151
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4153
 msgid "Account Confirmation Requested"
 msgstr "���� Ȯ�� ��û"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4181
 msgid "Error Changing Account Info"
 msgstr "���� ���� ���� �� ����"
 
-#: src/protocols/oscar/oscar.c:4136
+#: src/protocols/oscar/oscar.c:4184
 #, 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:4139
+#: src/protocols/oscar/oscar.c:4187
 #, 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:4142
+#: src/protocols/oscar/oscar.c:4190
 #, 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:4145
+#: src/protocols/oscar/oscar.c:4193
 #, 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:4148
+#: src/protocols/oscar/oscar.c:4196
 #, 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:4151
+#: src/protocols/oscar/oscar.c:4199
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4154
+#: src/protocols/oscar/oscar.c:4202
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4164
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4213 src/protocols/oscar/oscar.c:4220
 msgid "Account Info"
 msgstr "���� ����"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4453
 msgid "Unable to set AIM profile."
 msgstr "AIM �������� ������ �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4454
 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:4431
+#: src/protocols/oscar/oscar.c:4484
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6607,22 +6079,22 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:4489
 msgid "Profile too long."
 msgstr "���������� �ʹ� ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4508
 msgid "Unable to set AIM away message."
 msgstr "AIM �ڸ���� �޽����� ������ �� �����ϴ�."
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4509
 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:4496
+#: src/protocols/oscar/oscar.c:4549
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6633,27 +6105,27 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4501
+#: src/protocols/oscar/oscar.c:4554
 msgid "Away message too long."
 msgstr "�ڸ���� �޽����� �ʹ� ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:4774
 msgid "Unable To Retrieve Buddy List"
 msgstr "ģ������� ���� �� ����"
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4775
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
-#: src/protocols/oscar/oscar.c:4819
+#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4872
 msgid "Orphans"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5034
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6662,15 +6134,15 @@
 "�� ģ�� ��Ͽ� �ʹ� ���� ģ������ �־ %s���� ���� �� �����ϴ�. �ϳ��� ����"
 "�� �ٽ� �õ��ϼ���."
 
-#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5034 src/protocols/oscar/oscar.c:5047
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
+#: src/protocols/oscar/oscar.c:5035 src/protocols/oscar/oscar.c:5048
 msgid "Unable To Add"
 msgstr "���� �� ����"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6678,7 +6150,7 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6686,11 +6158,11 @@
 msgstr ""
 "%s���� ���� �ڽ��� ģ�� ��Ͽ� ����Ϸ��� �մϴ�. �츮�� ��븦 �߰��ұ��?"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5088
 msgid "Authorization Given"
 msgstr "������"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5121
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6700,80 +6172,68 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5114
-#, fuzzy, c-format
-msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "%s���� �� ģ����Ͽ� �ڽ��� ����ϴ� ���� ����߽��ϴ�."
-
-#: src/protocols/oscar/oscar.c:5115
+#: src/protocols/oscar/oscar.c:5163
+#, c-format
+msgid "The user %s has granted your request to add them to your contact list."
+msgstr "%s���� ģ�� ����� ����߽��ϴ�."
+
+#: src/protocols/oscar/oscar.c:5164
 msgid "Authorization Granted"
 msgstr "������ �����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5118
-#, fuzzy, c-format
+#: src/protocols/oscar/oscar.c:5167
+#, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
+"The user %s has denied your request to add them to your contact list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"%s���� ������ ���� ������ �� ģ����Ͽ� �ڽ��� ����ϴ� ���� �����߽��ϴ�:\n"
+"%s���� ������ ������ ģ�� ����� �����߽��ϴ�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5168
 msgid "Authorization Denied"
 msgstr "������ ������"
 
-#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
+#: src/protocols/oscar/oscar.c:5205 src/protocols/toc/toc.c:1241
 msgid "Exchange:"
 msgstr "��ȯ:"
 
-#: src/protocols/oscar/oscar.c:5379
+#: src/protocols/oscar/oscar.c:5427
 msgid "<b>Status:</b> "
 msgstr "<b>����:</b>"
 
-#: src/protocols/oscar/oscar.c:5388
+#: src/protocols/oscar/oscar.c:5436
 msgid "<b>Logged In:</b> "
 msgstr "<b>���ӽð�:</b> "
 
-#: src/protocols/oscar/oscar.c:5400
-#, fuzzy
-msgid "<b>IP Address:</b> "
-msgstr ""
-"\n"
-"<b>������:</b>"
-
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5443
 msgid "<b>Capabilities:</b> "
 msgstr "<b>���:</b>"
 
-#: src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:5450
 msgid "<b>Available:</b> "
 msgstr "<b>�̿밡��:</b>"
 
-#: src/protocols/oscar/oscar.c:5431
-#, fuzzy
-msgid "<b>Away Message:</b> "
-msgstr "�ڸ����"
-
-#: src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:5459
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>����:</b> ���� �ȵ�"
 
-#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5493
 msgid "Offline"
 msgstr "��������"
 
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:5732
 msgid "Unable to open Direct IM"
 msgstr "���̷�Ʈ �޽����� �� �� ����"
 
-#: src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:5745
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s�԰� ���̷�Ʈ �޽��� ������ �����߽��ϴ�."
 
-#: src/protocols/oscar/oscar.c:5937
+#: src/protocols/oscar/oscar.c:5748
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6781,118 +6241,80 @@
 "�̰��� �� IP �ּҸ� �˸��� ������ �����̹��� ������ ����ų ���� �ֽ��ϴ�. ��"
 "�� �ұ��?"
 
-#: src/protocols/oscar/oscar.c:6112
-#, fuzzy
-msgid "Buddy Comment:"
-msgstr "ģ�� �̸�(_B):"
-
-#: src/protocols/oscar/oscar.c:6128
-#, fuzzy
-msgid "Edit Buddy Comment"
-msgstr "ģ���˸� ��ġ��"
-
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:5893
 msgid "Get Status Msg"
 msgstr "���� �޽��� ����"
 
-#: src/protocols/oscar/oscar.c:6151
-msgid "Direct IM"
-msgstr "���� ����"
-
-#: src/protocols/oscar/oscar.c:6180
-#, fuzzy
-msgid "Re-request Authorization"
-msgstr "���� ���û"
-
-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:5958
 msgid "The new formatting is invalid."
 msgstr "���ο� ������ ��ȿ���� �ʽ��ϴ�."
 
-#: src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:5959
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6208
+#: src/protocols/oscar/oscar.c:5965
 msgid "New screenname formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6257
+#: src/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "�ٲ� �ּ�: "
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6028
+msgid "You are awaiting authorization from the following buddies:<BR>"
+msgstr "���� ģ������ ������ ��ٸ��� ����:<BR>"
+
+#: src/protocols/oscar/oscar.c:6053
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>������ ��ٸ��� ���� ����<i>"
 
-#: src/protocols/oscar/oscar.c:6304
-#, fuzzy
-msgid "You are awaiting authorization from the following buddies"
-msgstr "�Ʒ��� ģ����κ��� ������ ��ٸ��� ����:<BR>"
-
-#: src/protocols/oscar/oscar.c:6305
-#, fuzzy
+#: src/protocols/oscar/oscar.c:6058
+#, c-format
 msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"%s<BR><BR>ģ�� �̸� ������ ������ Ŭ���ϰ� \"���� ���û\"�� ������ ���� ���"
-"û�� �� �� �ֽ��ϴ�."
-
-#: src/protocols/oscar/oscar.c:6319
-#, fuzzy
-msgid "Find Buddy by E-mail"
-msgstr "�̸��Ϸ� ģ�� ã��"
-
-#: src/protocols/oscar/oscar.c:6320
-#, fuzzy
-msgid "Search for a buddy by e-mail address"
-msgstr "�̸��Ϸ� ģ�� ã��"
-
-#: src/protocols/oscar/oscar.c:6321
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6324
-msgid "Search"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6337
+"%s<BR><BR>You can re-request authorization from these buddies by right-"
+"clicking on them and clicking \"Re-request authorization.\""
+msgstr ""
+"%s<BR><BR>ģ�� �̸� ������ ������ Ŭ���ϰ� \"���� ���û\"�� Ŭ���� "
+"���� ���û�� �� �� �ֽ��ϴ�."
+
+#: src/protocols/oscar/oscar.c:6074
 msgid "Available Message:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6415
+msgstr "��ȿ�� �޽���:"
+
+#: src/protocols/oscar/oscar.c:6075
+msgid "Please talk to me, I'm lonely! (and single)"
+msgstr "���� ������ּ���, �� �ܷο���! (�׸��� �̱�)"
+
+#: src/protocols/oscar/oscar.c:6137
 msgid "Set Available Message"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6429
+msgstr "��ȿ�� �޽��� ����"
+
+#: src/protocols/oscar/oscar.c:6151
 msgid "Change Password (URL)"
 msgstr "��й�ȣ �ٲٱ� (URL)"
 
-#: src/protocols/oscar/oscar.c:6437
-msgid "Configure IM Forwarding (URL)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6448
+#: src/protocols/oscar/oscar.c:6162
 msgid "Format Screenname"
 msgstr "���̵�"
 
-#: src/protocols/oscar/oscar.c:6454
+#: src/protocols/oscar/oscar.c:6168
 msgid "Confirm Account"
 msgstr "���� Ȯ��"
 
-#: src/protocols/oscar/oscar.c:6460
+#: src/protocols/oscar/oscar.c:6174
 msgid "Display Current Registered Address"
 msgstr "���� ��ϵ� �ּ� �����ֱ�"
 
-#: src/protocols/oscar/oscar.c:6466
+#: src/protocols/oscar/oscar.c:6180
 msgid "Change Current Registered Address"
 msgstr "���� ��ϵ� �ּ� �ٲٱ�"
 
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6189
 msgid "Show Buddies Awaiting Authorization"
 msgstr "������ ��ٸ��� �ִ� ģ�� �����ֱ�"
 
-#: src/protocols/oscar/oscar.c:6483
+#: src/protocols/oscar/oscar.c:6197
 msgid "Search for Buddy by Email"
 msgstr "�̸��Ϸ� ģ�� ã��"
 
@@ -6906,122 +6328,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
+#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �������� �÷�����"
 
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:6337
 msgid "Auth host"
 msgstr "���� ȣ��Ʈ"
 
-#: src/protocols/oscar/oscar.c:6628
+#: src/protocols/oscar/oscar.c:6342
 msgid "Auth port"
 msgstr "���� ��Ʈ"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Looking up %s"
 msgstr "%s(��)�� � ��"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ���Ͽ� ����� �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ������ ���� �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "�޽����� �ʹ� �� ������ %s ����Ʈ�� ©�Ƚ��ϴ�."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s���� ���� �α������� �ʾҽ��ϴ�."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:524
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s ����� ������ �ʽ��ϴ�."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:527
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "������ �ӵ��Ѱ踦 �Ѿ��� ������ �޽����� ���� �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s�� ä�� ������ �� �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s�Կ��� �ʹ� ���� �޽����� ������ �ֽ��ϴ�."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s�Կ��Լ� �� �޽����� �ʹ� Ŀ�� ������ �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:539
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s���� �޽����� �ʹ� ���� ������ ������ �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:542
 msgid "Failure."
 msgstr "����."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:545
 msgid "Too many matches."
 msgstr "�ش� �׸��� �ʹ� �����ϴ�."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:548
 msgid "Need more qualifiers."
 msgstr "�� ���� �����Ͻʽÿ�."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:551
 msgid "Dir service temporarily unavailable."
 msgstr "���丮 ���񽺸� �Ͻ������� ����� �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:554
 msgid "Email lookup restricted."
 msgstr "���� ã�ƺ��Ⱑ �����Ǿ� �ֽ��ϴ�."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:557
 msgid "Keyword ignored."
 msgstr "Ű���尡 ���õǾ����ϴ�."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:560
 msgid "No keywords."
 msgstr "Ű���尡 �����ϴ�."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:563
 msgid "User has no directory information."
 msgstr "����ڰ� ���丮 ������ ���� ���� �ʽ��ϴ�."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:567
 msgid "Country not supported."
 msgstr "�������� �ʴ� �����Դϴ�."
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:570
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "�� �� ���� ����: %s."
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:576
 msgid "The service is temporarily unavailable."
 msgstr "��� ���񽺰� ��� �Ұ����մϴ�."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:579
 msgid "Your warning level is currently too high to log in."
 msgstr "�α����ϱ⿡�� ��� ������ �ʹ� �����ϴ�."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:582
 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."
@@ -7029,38 +6451,38 @@
 "�ʹ� ���� ����� ���Ḧ �ݺ��Ͽ����ϴ�. 10���� ��ٸ� �� �ٽ� �õ��Ͻʽÿ�. "
 "��� �õ��Ѵٸ� ��ٷ��� �ϴ� �ð��� �� ������ϴ�."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "���� �߿� �� �� ���� ������ �߻��Ͽ����ϴ�: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:587
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "�� �� ���� ����, %d(��)�� �߻��Ͽ����ϴ�.  ����: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:607
 msgid "Connection Closed"
 msgstr "������ ������ϴ�."
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:647
 msgid "Waiting for reply..."
 msgstr "����� ��ٸ��� ��..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:717
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC�� �Ͻ����� ���¿��� �ٽ� ���۵Ǿ����ϴ�. ���� �޽����� ���� �� �ֽ��ϴ�."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:905
 msgid "Password Change Successful"
 msgstr "��й�ȣ�� ���������� �ٲپ���"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:909
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC�� PAUSE ������ ���½��ϴ�."
 
-#: src/protocols/toc/toc.c:908
+#: src/protocols/toc/toc.c:910
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -7070,43 +6492,43 @@
 "�����մϴ�. �׸��� ���� �޽����� ������ ������ ��������� �� �ֽ��ϴ�. �̰�"
 "�� �Ͻ����� �����̴� �Ű澲�� ���ʽÿ�."
 
-#: src/protocols/toc/toc.c:1401
+#: src/protocols/toc/toc.c:1379
 msgid "Get Dir Info"
 msgstr "���丮 ���� ����"
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1503
 msgid "Set Dir Info"
 msgstr "���丮 ���� ����"
 
-#: src/protocols/toc/toc.c:1663
+#: src/protocols/toc/toc.c:1626
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s(��)�� ���� ���� �� �� �����ϴ�!"
 
-#: src/protocols/toc/toc.c:1699
+#: src/protocols/toc/toc.c:1662
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
-#: src/protocols/toc/toc.c:1996
+#: src/protocols/toc/toc.c:1707 src/protocols/toc/toc.c:1747
+#: src/protocols/toc/toc.c:1959
 msgid "Could not connect for transfer."
 msgstr "������ ���� ������ �� �����ϴ�."
 
-#: src/protocols/toc/toc.c:1908
+#: src/protocols/toc/toc.c:1871
 msgid "Could not connect for transfer!"
 msgstr "������ ���� ������ �� �����ϴ�!"
 
-#: src/protocols/toc/toc.c:1941
+#: src/protocols/toc/toc.c:1904
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "���� ����� �� �� �����ϴ�. ���� ������ �Ϸ���� �ʾ��� ���Դϴ�."
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2038
 #, 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"
 
-#: src/protocols/toc/toc.c:2082
+#: src/protocols/toc/toc.c:2045
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s���� ������ �����޶�� ��û�Ͽ����ϴ�"
@@ -7121,91 +6543,95 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#: src/protocols/toc/toc.c:2120 src/protocols/toc/toc.c:2122
 msgid "TOC Protocol Plugin"
 msgstr "TOC �������� �÷�����"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2139
 msgid "TOC host"
 msgstr "TOC ȣ��Ʈ"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2143
 msgid "TOC port"
 msgstr "TOC ��Ʈ"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:254
+#: src/protocols/trepia/trepia.c:295
 msgid "Basic Profile"
 msgstr "�⺻ ������"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:285
+#: src/protocols/trepia/trepia.c:326
 msgid "E-Mail Address"
 msgstr "���� �ּ�"
 
-#: src/protocols/trepia/trepia.c:291
+#: src/protocols/trepia/trepia.c:332
 msgid "Profile Information"
 msgstr "��������"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:297
+#: src/protocols/trepia/trepia.c:338
 msgid "Instant Messagers"
 msgstr "�ν���Ʈ �޽���"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:301
+#: src/protocols/trepia/trepia.c:342
 msgid "AIM"
 msgstr "�޽���"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:305
+#: src/protocols/trepia/trepia.c:346
 msgid "ICQ UIN"
 msgstr ""
 
 #. MSN
-#: src/protocols/trepia/trepia.c:309
+#: src/protocols/trepia/trepia.c:350
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:313
+#: src/protocols/trepia/trepia.c:354
 msgid "Yahoo"
 msgstr "����"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:359
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:376
 msgid "Set your Trepia profile data."
 msgstr "Trepia ������ �����͸� �����մϴ�."
 
-#: src/protocols/trepia/trepia.c:459
+#: src/protocols/trepia/trepia.c:500
 msgid "Profile"
 msgstr "������"
 
-#: src/protocols/trepia/trepia.c:481
+#: src/protocols/trepia/trepia.c:522
 msgid "Set Profile"
 msgstr "������ ����"
 
-#: src/protocols/trepia/trepia.c:517
+#: src/protocols/trepia/trepia.c:558
 msgid "Visit Homepage"
 msgstr "Ȩ������ �湮"
 
-#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
+#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
 msgid "Local Users"
 msgstr "���� �����"
 
-#: src/protocols/trepia/trepia.c:962
+#: src/protocols/trepia/trepia.c:1003
 msgid "Read error"
 msgstr "�б� ����"
 
-#: src/protocols/trepia/trepia.c:1063
+#: src/protocols/trepia/trepia.c:1104
 msgid "Logging in"
 msgstr ""
 
+#: src/protocols/trepia/trepia.c:1147
+msgid "Unable to create socket"
+msgstr "������ ���� �� ����"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7216,187 +6642,102 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
+#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia �������� �÷�����"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:586
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! �޽����� ���޵��� �ʾҽ��ϴ�."
 
-#: src/protocols/yahoo/yahoo.c:758
-#, fuzzy, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s���� �� ģ����Ͽ� �ڽ��� ����ϴ� ���� ����߽��ϴ�."
-
-#: src/protocols/yahoo/yahoo.c:760
-#, fuzzy, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s���� ������ ���� ������ �� ģ����Ͽ� �ڽ��� ����ϴ� ���� �����߽��ϴ�:\n"
-"%s"
-
-#: src/protocols/yahoo/yahoo.c:761
-#, fuzzy
-msgid "Add buddy rejected"
-msgstr "ģ���˸� ���ϱ�(_P)"
-
-#: src/protocols/yahoo/yahoo.c:1381
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1384
-#, fuzzy
-msgid "Failed Yahoo! Authentication"
-msgstr "���� Ȯ�� ��"
-
-#: src/protocols/yahoo/yahoo.c:1457
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1460
-#, fuzzy
-msgid "Ignore buddy?"
-msgstr "����"
-
-#: src/protocols/yahoo/yahoo.c:1489
-#, fuzzy
-msgid "Invalid username."
-msgstr "�߸��� ����� �̸�"
-
-#: src/protocols/yahoo/yahoo.c:1492
-#, fuzzy
-msgid "Incorrect password."
-msgstr "���̵� �н����尡 Ʋ�Ƚ��ϴ�."
-
-#: src/protocols/yahoo/yahoo.c:1495
-#, fuzzy
-msgid "Unknown error."
-msgstr "�� �� ���� ����"
-
-#: src/protocols/yahoo/yahoo.c:1542
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1544
-#, fuzzy
-msgid "Could not add buddy to server list"
-msgstr "ģ�� ����� ������ �� �����ϴ�."
-
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:891
 msgid "Unable to read"
 msgstr "���� �� ����"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:991
 msgid "Connection problem"
 msgstr "���� ����"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:1053 src/protocols/yahoo/yahoo.c:1263
+#: src/protocols/yahoo/yahoo.c:1337
 msgid "Not At Home"
 msgstr "���� ����"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:1055 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1338
 msgid "Not At Desk"
 msgstr "�ڸ��� ����"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1267
+#: src/protocols/yahoo/yahoo.c:1339
 msgid "Not In Office"
 msgstr "�繫�ǿ� ����"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1271
+#: src/protocols/yahoo/yahoo.c:1341
 msgid "On Vacation"
 msgstr "�ް���"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1275
+#: src/protocols/yahoo/yahoo.c:1343
 msgid "Stepped Out"
 msgstr "�����"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
-#, fuzzy
-msgid "Not on server list"
-msgstr "��Ͽ� ����"
-
-#: src/protocols/yahoo/yahoo.c:2178
-#, fuzzy
-msgid "Join in Chat"
-msgstr "� ����"
-
-#: src/protocols/yahoo/yahoo.c:2184
-#, fuzzy
-msgid "Initiate Conference"
-msgstr "� ����"
-
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:1181
 msgid "Active which ID?"
 msgstr "ID�� Ȱ��ȭ�ұ��?"
 
-#: src/protocols/yahoo/yahoo.c:2241
+#: src/protocols/yahoo/yahoo.c:1192
 msgid "Activate ID"
 msgstr "ID Ȱ��ȭ"
 
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:1420
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:1422 src/protocols/yahoo/yahoo.c:1438
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2619
+"web browser"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1436
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:1470
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:1512 src/protocols/yahoo/yahoo.c:1514
+#: src/protocols/yahoo/yahoo.c:1516
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:1518 src/protocols/yahoo/yahoo.c:1520
 msgid "Latest News"
 msgstr "�ֽ� ����"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:1529
 msgid "Home Page"
 msgstr "Ȩ������"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:1539
 msgid "Cool Link 1"
 msgstr "���� ��ũ 1"
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:1541
 msgid "Cool Link 2"
 msgstr "���� ��ũ 2"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:1543
 msgid "Cool Link 3"
 msgstr "���� ��ũ 3"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:1547
 msgid "Member Since"
 msgstr "���Խñ�"
 
@@ -7410,92 +6751,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/yahoo/yahoo.c:1638 src/protocols/yahoo/yahoo.c:1640
 msgid "Yahoo Protocol Plugin"
 msgstr "���� �������� �÷�����"
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:1657
 msgid "Pager host"
 msgstr "���� ȣ��Ʈ"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:1662
 msgid "Pager port"
 msgstr "���� ��Ʈ"
 
-#: src/protocols/yahoo/yahoochat.c:194
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:196
-#, fuzzy
-msgid "Invitation Rejected"
-msgstr "�ʴ��ڸ�"
-
-#: src/protocols/yahoo/yahoochat.c:333
-#, fuzzy
-msgid "Failed to join chat"
-msgstr "��ȭ�� ������ �� ����"
-
-#: src/protocols/yahoo/yahoochat.c:333
-msgid "Maybe the room is full?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:531
-#, fuzzy
-msgid "Failed to join buddy in chat"
-msgstr "��ȭ�� ������ �� ����"
-
-#: src/protocols/yahoo/yahoochat.c:532
-msgid "Maybe they're not in a chat?"
+#: src/protocols/zephyr/zephyr.c:336
+#, c-format
+msgid "<b>User:</b> %s<br>"
+msgstr "<b>�����:</b> %s<br>"
+
+#: src/protocols/zephyr/zephyr.c:338
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>��Ī:</b> %s<br>"
+
+#: src/protocols/zephyr/zephyr.c:340
+msgid "<br>Hidden or not logged-in"
 msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>�����:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:346
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>��Ī:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:348
-msgid "<br>Hidden or not logged-in"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:352
-#, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:571 src/protocols/zephyr/zephyr.c:572
 msgid "Anyone"
 msgstr "�ƹ���"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:596
 msgid "Already logged in with Zephyr"
 msgstr "�̹� Zephyr�� �����"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:597
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:846
 msgid "ZLocate"
 msgstr "Z��ġ"
 
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Class:"
 msgstr "Ŭ����:"
 
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:891
 msgid "Instance:"
 msgstr "�ν��Ͻ�:"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:896
 msgid "Recipient:"
 msgstr "�޴»��:"
 
@@ -7509,68 +6822,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#: src/protocols/zephyr/zephyr.c:1028 src/protocols/zephyr/zephyr.c:1030
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr �������� �÷�����"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1680
 msgid "Invalid proxy settings"
 msgstr "�߸��� ���Ͻ� ����"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1680
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
+#: src/prpl.c:293
+#, 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:305
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"�� ģ�� ��Ͽ� ���ұ��?"
+
+#: src/prpl.c:308
+msgid "Gaim - Information"
+msgstr "���� - ����"
+
+#: src/prpl.c:311
+msgid "Add buddy to your list?"
+msgstr "�� ģ�� ��Ͽ� ģ���� ���ұ��?"
+
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:185
 msgid "Custom"
 msgstr "���������"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:823
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:56
+#: src/server.c:57
 msgid "Please enter your password"
 msgstr "��й�ȣ�� �Է��ϼ���"
 
-#: src/server.c:949
+#: src/server.c:934
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d �޽���)"
 
-#: src/server.c:962
+#: src/server.c:947
 msgid "(1 message)"
 msgstr "(1 �޽���)"
 
-#: src/server.c:1145 src/server.c:1155
+#: src/server.c:1139 src/server.c:1149
 #, c-format
 msgid "%s logged in."
 msgstr "%s���� �����߽��ϴ�."
 
-#: src/server.c:1172 src/server.c:1180
+#: src/server.c:1168 src/server.c:1176
 #, c-format
 msgid "%s logged out."
 msgstr "%s���� ������ �������ϴ�."
 
-#: src/server.c:1227
+#: src/server.c:1225
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1230
+#: src/server.c:1228
 msgid "an anonymous person"
 msgstr "�͸� �����"
 
-#: src/server.c:1333
+#: src/server.c:1323
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7579,15 +6915,23 @@
 "'%s'���� %s���� ��ȭ�ǿ� �ʴ�: '%s'\n"
 "%s"
 
-#: src/server.c:1337
+#: src/server.c:1327
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "'%s'���� %s���� ��ȭ�ǿ� �ʴ�: '%s'\n"
 
-#: src/server.c:1343
+#: src/server.c:1333
 msgid "Accept chat invitation?"
 msgstr ""
 
+#: src/server.c:1522
+msgid "Gaim - Popup"
+msgstr "���� - �˾�"
+
+#: src/server.c:1549
+msgid "More Info"
+msgstr "���� ����"
+
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7603,183 +6947,25 @@
 msgid "_Open Mail"
 msgstr "���� ����(_O)"
 
-#: src/util.c:1527
-msgid "Calculating..."
-msgstr "�����..."
-
-#: src/util.c:1530
-msgid "Unknown."
-msgstr "�˷����� ����."
-
-#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
+#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
 msgid "day"
 msgid_plural "days"
 msgstr[0] "��"
 
-#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
+#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�ð�"
 
-#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
+#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 
-#: src/util.c:1917
-msgid "g003: Error opening connection.\n"
-msgstr "g003: ������ ���� �߻�.\n"
-
-#: src/win32/win32dep.c:474
-#, fuzzy
-msgid "Notification"
-msgstr "Ÿ���� �˸�"
-
-#: src/win32/win32dep.c:475
-msgid "Moving Gaim user settings directory to:"
-msgstr ""
-
-#~ msgid "_Quote window title"
-#~ msgstr "â ���� ǥ��(_Q)"
-
-#~ msgid "_Notify even if conversation is in focus"
-#~ msgstr "��ȭ â�� Ȱ��ȭ �Ǿ� �־ �˸�(_N)"
-
-#~ msgid ""
-#~ "Gaim is converting your old buddy lists to a new format, which will now "
-#~ "be located at %s"
-#~ msgstr ""
-#~ "������ ���� ģ�� ����� �� ������� ��ȯ�մϴ�. ������ %s�� ��ġ�մϴ�."
-
-#~ msgid "Converting Buddy List"
-#~ msgstr "ģ�� ��� ��ȯ"
-
-#~ msgid ""
-#~ "Communication with the browser failed. Please close all windows and try "
-#~ "again."
-#~ msgstr "������ ������ �����߽��ϴ�. ��� �����츦 �ݰ� �ٽ� �������ּ���."
-
-#~ msgid "There was an error launching your chosen browser: %s"
-#~ msgstr "���õ� �������� �����ϴµ� ������ �߻�����: %s"
-
-#~ msgid "Alias"
-#~ msgstr "��Ī"
-
-#~ msgid "Group"
-#~ msgstr "�׷�"
-
-#~ msgid "Add To"
-#~ msgstr "����"
-
-#~ msgid "Set Directory Info"
-#~ msgstr "���丮 ���� ����"
-
-#~ msgid "Directory Info"
-#~ msgstr "���丮 ����"
-
-#~ msgid "Setting Dir Info for %s:"
-#~ msgstr "%s�� ���丮 ���� ����:"
-
-#~ msgid "Allow Web Searches To Find Your Info"
-#~ msgstr "���� ���� �� ������ ã�� �� �ֵ��� ���"
-
-#~ msgid "Maiden Name"
-#~ msgstr "��ȥ �� �̸�"
-
-#~ msgid "Below are the results of your search: "
-#~ msgstr "ã�� ����� ������ �����ϴ�: "
-
-#~ msgid "Search for Buddy"
-#~ msgstr "ģ�� ã��"
-
-#~ msgid "Find Buddy By Info"
-#~ msgstr "������ ģ�� ã��"
-
-#~ msgid ""
-#~ "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-#~ msgstr ""
-#~ "�Էµ� '%s' �������� ��ȿ���� �ʽ��ϴ�. �����۸�ũ�� �������� ���� ����"
-#~ "�ϴ�."
-
-#~ msgid ""
-#~ "The current password you entered is incorrect.  Your password has not "
-#~ "been changed."
-#~ msgstr ""
-#~ "�Է��Ͻ� ��й�ȣ�� �߸��Ǿ����ϴ�.  ��й�ȣ�� ������� �ʾҽ��ϴ�."
-
-#~ msgid ""
-#~ "The new password you entered is the same as your current password.  Your "
-#~ "password remains the same."
-#~ msgstr ""
-#~ "�� ��й�ȣ�� ���� ��й�ȣ�� �����ϴ�.  ��й�ȣ�� �״�� �����˴ϴ�."
-
-#~ msgid "Jabber Error %s"
-#~ msgstr "��� ����: %s"
-
-#~ msgid "Error %s: %s"
-#~ msgstr "���� %s: %s"
-
-#~ msgid "No such user."
-#~ msgstr "�׷� ����ڰ� �����ϴ�."
-
-#~ msgid "Unknown login error"
-#~ msgstr "�� �� ���� ��� ����"
-
-#~ msgid "Password successfully changed."
-#~ msgstr "��й�ȣ�� ���������� �ٲپ����ϴ�."
-
-#~ msgid "Connected"
-#~ msgstr "�����"
-
-#~ msgid "Requesting Authentication Method"
-#~ msgstr "���� ����� ��û�ϴ� ��"
-
-#~ msgid "Unable to add buddy."
-#~ msgstr "ģ���� ���� �� �����ϴ�."
-
-#~ msgid "View Error Msg"
-#~ msgstr "���� �޽��� ����"
-
-#~ msgid "Error %d: %s"
-#~ msgstr "���� %d: %s"
-
-#~ msgid "Unknown registration error"
-#~ msgstr "�� �� ���� ��� ����"
-
-#~ msgid "<B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>����:</B> %s<HR>%s"
-
-#~ msgid "EveryBuddy Bug"
-#~ msgstr "EveryBuddy ����"
-
-#~ msgid "ICQ Unknown"
-#~ msgstr "ICQ �˷����� ����"
-
-#~ msgid ""
-#~ "Username : <b>%s</b>  %s <br>\n"
-#~ "Warning Level : <b>%d %%</b><br>\n"
-#~ "%s%s%s\n"
-#~ "<hr>\n"
-#~ msgstr ""
-#~ "����� �̸� : <b>%s</b>  %s <br>\n"
-#~ "��� ���� : <b>%d %%</b><br>\n"
-#~ "%s%s%s\n"
-#~ "<hr>\n"
-
-#~ msgid "<i>User has no away message</i>"
-#~ msgstr "<i>�ڸ���� �޽����� ����</i>"
-
-#~ msgid "Client Capabilities: "
-#~ msgstr "Ŭ���̾�Ʈ ȣȯ: "
-
-#~ msgid "<i>No Information Provided</i>"
-#~ msgstr "<i>������ ����</i>"
-
-#~ msgid "<B>%s has the following screen names:</B><BR>"
-#~ msgstr "<B>%s ���̵�� ������ ���̵� �����:<B><BR>"
-
-#~ msgid "Gaim - Popup"
-#~ msgstr "���� - �˾�"
-
-#~ msgid "More Info"
-#~ msgstr "���� ����"
+#: src/util.c:934
+msgid "Calculating..."
+msgstr "�����..."
+
+#: src/util.c:937
+msgid "Unknown."
+msgstr "�˷����� ����."