diff po/ko.po @ 8778:8bf735cf9d1c

[gaim-migrate @ 9540] (17:44:08) Faceprint: ping (17:44:17) Me: semi-pong (17:44:26) Faceprint: in a position to commit, or not? (17:44:40) Me: more or less (17:44:48) Me: not in a possition to think though (17:44:56) Faceprint: no real thought required (17:45:29) Faceprint: jabber.c, in jabber_login_callback, before the check to see if gc is in gaim_connections_get_all(), please add: (17:45:32) Faceprint: if (source < 0) { gaim_connection_error(gc, _("Couldn't connect to host")); return; } (17:45:53) Faceprint: and change the if statement in irc_login_cb in irc.c to be the same oh and vi automatically tabbing sucks and sometime i ran make dist committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 Apr 2004 21:50:17 +0000
parents 03b9ce930f0d
children 83c3df575f73
line wrap: on
line diff
--- a/po/ko.po	Fri Apr 23 17:34:41 2004 +0000
+++ b/po/ko.po	Fri Apr 23 21:50:17 2004 +0000
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.72cvs\n"
-"POT-Creation-Date: 2003-09-03 00:10+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-22 22:29-0400\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"
@@ -24,14 +25,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "ÀÚµ¿À¸·Î ´Ù½Ã ¿¬°á"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Á¢¼ÓÀÌ ²÷±â¸é ´Ù½Ã Á¢¼ÓÇÕ´Ï´Ù."
 
@@ -52,6 +54,69 @@
 msgid "Check email every X seconds.\n"
 msgstr "¸Å X Ãʸ¶´Ù ¸ÞÀÏÀ» È®ÀÎÇÕ´Ï´Ù.\n"
 
+#: plugins/contact_priority.c:82
+msgid "Point values to use when..."
+msgstr ""
+
+#: plugins/contact_priority.c:91
+#, fuzzy
+msgid "Buddy is offline:"
+msgstr "Ä£±¸ ¾ÆÀÌÄÜ ÆÄÀÏ:"
+
+#: plugins/contact_priority.c:105
+#, fuzzy
+msgid "Buddy is away:"
+msgstr "Ä£±¸ º¸¿©ÁÖ±â"
+
+#: plugins/contact_priority.c:119
+#, fuzzy
+msgid "Buddy is idle:"
+msgstr "Ä£±¸ ¾ÆÀÌÄÜ ÆÄÀÏ:"
+
+#: plugins/contact_priority.c:133
+msgid "Use last matching buddy"
+msgstr ""
+
+#. Explanation
+#: plugins/contact_priority.c:139
+msgid ""
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
+msgstr ""
+
+#: plugins/contact_priority.c:142
+msgid "Point values to use for Account..."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/contact_priority.c:191
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:194
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: plugins/contact_priority.c:196
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -67,12 +132,13 @@
 msgid "Gaim - Away"
 msgstr "°ÔÀÓ - ÀÚ¸®ºñ¿ò"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:441 src/gtkaccount.c:1612
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "ÀÚµ¿ ·Î±×ÀÎ"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+#, fuzzy
+msgid "New Message..."
 msgstr "»õ ¸Þ½ÃÁö.."
 
 #: plugins/docklet/docklet.c:118
@@ -83,16 +149,19 @@
 msgid "New..."
 msgstr "»õ..."
 
-#: 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
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr "ÀÚ¸®ºñ¿ò"
 
-#: plugins/docklet/docklet.c:159 src/away.c:513
+#. else...
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "µ¹¾Æ¿È"
 
@@ -100,16 +169,16 @@
 msgid "Mute Sounds"
 msgstr "À½¼Ò°Å"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "ÆÄÀÏ Àü¼Û"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1765 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 msgid "Accounts"
 msgstr "°èÁ¤"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2361 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
 msgid "Preferences"
 msgstr "±âº» ¼³Á¤"
 
@@ -121,11 +190,11 @@
 msgid "Quit"
 msgstr "³¡³»±â"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:478
 msgid "Tray Icon Configuration"
 msgstr "Æ®·¹ÀÌ ¾ÆÀÌÄÜ ¼³Á¤"
 
-#: plugins/docklet/docklet.c:486
+#: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "Æ®·¹ÀÌ ¾ÆÀÌÄÜÀÌ Å¬¸¯µÇ±â Àü±îÁö´Â »õ ¸Þ½ÃÁö ¼û±è(_H)"
 
@@ -136,19 +205,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
 msgstr "½Ã½ºÅÛ Æ®·¹ÀÌ ¾ÆÀÌÄÜ"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:513
+#: plugins/docklet/docklet.c:509
 msgid "Displays an icon for Gaim in the system tray."
 msgstr ""
 
 #. *  description
-#: plugins/docklet/docklet.c:515
+#: plugins/docklet/docklet.c:511
 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, "
@@ -167,33 +236,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr "°ÔÀÓ ÆÄÀÏ ÄÜÆ®·Ñ"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#. *  description
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "AIM¿¡ ¿¬°áµÇÁö ¾ÊÀ½"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "¾ÆÀ̵𸦠ÀÔ·ÂÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "¹æ À̸§À» ÀÔ·ÂÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "À߸øµÈ AIM URI"
 
+#: plugins/gaim-remote/remote.c:651
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+
+#: plugins/gaim-remote/remote.c:674
+#, fuzzy
+msgid "Unable to open socket"
+msgstr "¼ÒÄÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -201,19 +283,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "¸®¸ðÄÜ"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "°ÔÀÓ ÇÁ·Î±×·¥À» À§ÇØ ¸®¸ðÄÜÀ» Á¦°øÇÕ´Ï´Ù."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -228,19 +310,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "°ÔÀÓ Ç÷¯±×ÀÎ ½Ã¿¬"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -295,47 +377,190 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "±×³ð Áõ±Ç ½Ã¼¼ Ç¥½Ã±â ȯ°æ ¼³Á¤"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "¾÷µ¥ÀÌÆ® °£°Ý(ºÐ´ÜÀ§)"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "¾Æ·¡ÀÇ »óÀÚ¿¡ ±âÈ£¸¦ \"+\"·Î ±¸ºÐÇÏ¿© ÀÔ·ÂÇϼ¼¿ä."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "±âÈ£¿Í °¡°Ý¸¸ º¸¿©ÁÖ±â:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î ½ºÅ©·Ñ:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(Ãë¼Ò"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "¹Ù²Ù±â"
-
-#: plugins/history.c:90
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:74
+#, fuzzy
+msgid "Local Addressbook"
+msgstr "¸ÞÀÏ ÁÖ¼Ò"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
+#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "º¸¿©ÁÖÁö ¾ÊÀ½"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+msgid "Name"
+msgstr "À̸§"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+msgid "Search"
+msgstr ""
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
+msgid "Group:"
+msgstr "±×·ì:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:486
+#, fuzzy
+msgid "New Person"
+msgstr "»õ ºñ¹Ð¹øÈ£"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+#, fuzzy
+msgid "Select Buddy"
+msgstr "Ä£±¸ Áö¿ì±â"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:370
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:449
+#, fuzzy
+msgid "Show user details"
+msgstr "´Ù¿î·Îµå ³»¿ë º¸À̱â"
+
+#: plugins/gevolution/assoc-buddy.c:450
+#, fuzzy
+msgid "Hide user details"
+msgstr "´Ù¿î·Îµå ³»¿ë °¨Ãß±â"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:503
+#, fuzzy
+msgid "_Associate Buddy"
+msgstr "Ä£±¸ º°Äª"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+msgid "Buddies"
+msgstr "Ä£±¸"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr ""
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:347
+#, fuzzy
+msgid "Evolution Integration Configuration"
+msgstr "Æ®·¹ÀÌ ¾ÆÀÌÄÜ ¼³Á¤"
+
+#. Label
+#: plugins/gevolution/gevolution.c:350
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#, fuzzy
+msgid "Account"
+msgstr "°èÁ¤"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:461
+#, fuzzy
+msgid "Evolution Integration"
+msgstr "Ãß°¡Á¤º¸"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+msgid "Provides integration with Ximian Evolution."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:270
+#, fuzzy
+msgid "Please enter the person's information below."
+msgstr "»ç¿ëÀÚÀÇ Á¤º¸ °¡Á®¿À±â"
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr ""
+
+#: plugins/gevolution/new_person_dialog.c:294
+#, fuzzy
+msgid "Account type:"
+msgstr "°èÁ¤:"
+
+#: plugins/gevolution/new_person_dialog.c:298
+msgid "Screenname:"
+msgstr "¾ÆÀ̵ð:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+#, fuzzy
+msgid "Optional information:"
+msgstr "Ãß°¡Á¤º¸"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: src/protocols/oscar/oscar.c:425
+msgid "Buddy Icon"
+msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
+
+#: plugins/gevolution/new_person_dialog.c:353
+#, fuzzy
+msgid "First name:"
+msgstr "À̸§"
+
+#: plugins/gevolution/new_person_dialog.c:365
+#, fuzzy
+msgid "Last name:"
+msgstr "À̸§"
+
+#: plugins/gevolution/new_person_dialog.c:385
+#, fuzzy
+msgid "E-mail:"
+msgstr "¸ÞÀÏ"
+
+#: plugins/history.c:70
 msgid "History"
 msgstr "´ëÈ­ ³»¿ª"
 
-#: plugins/history.c:92
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr "»õ ´ëÈ­ ¿¬°á½Ã Áö³­ ±â·ÏÀ» º¸ÀÔ´Ï´Ù."
 
-#: 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."
+#: plugins/history.c:73
+#, fuzzy
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 "»õ ´ëÈ­°¡ ¿­·ÈÀ» ¶§ ÀÌ Ç÷¯±×ÀÎÀº ÇöÀç ´ëȭâ¿¡ Áö³­ ´ëÈ­ÀÇ ³»¿ëÀ» ³Ö¾îÁÝ´Ï"
 "´Ù."
@@ -354,6 +579,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "ÀÚ¸®ºñ¿ò »óÅÂÀÏ ¶§ ´ëȭâ°ú Ä£±¸ ¸ñ·ÏÀ» ¾ÆÀÌÄÜÈ­ ÇÕ´Ï´Ù."
@@ -370,7 +596,7 @@
 msgid "idle for"
 msgstr " "
 
-#: plugins/idle.c:90 plugins/timestamp.c:88
+#: plugins/idle.c:90 plugins/timestamp.c:109
 msgid "minutes."
 msgstr "µ¿¾È »ç¿ëÇÏÁö ¾ÊÀ½."
 
@@ -386,68 +612,30 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "¼öµ¿À¸·Î ³»°¡ ¾ó¸¶³ª »ç¿ëÇÏÁö ¾Ê¾Ò´ÂÁö Á¤ÇÒ ¼ö ÀÖ°Ô ÇÕ´Ï´Ù."
 
-#: plugins/mailchk.c:156
-msgid "Mail Checker"
-msgstr "¸ÞÀÏ °Ë»ç±â"
-
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
-msgid "Checks for new local mail."
-msgstr "»õ ·ÎÄà ¸ÞÀÏÀÌ ÀÖ´ÂÁö °Ë»çÇÕ´Ï´Ù."
-
-#. ---------- "Notify For" ----------
-#: plugins/notify.c:707
-msgid "Notify For"
-msgstr "´ÙÀ½ °æ¿ì ¾Ë¸²"
-
-#: plugins/notify.c:711
-msgid "_IM windows"
-msgstr "¸Þ½ÅÀú â(_I)"
-
-#: plugins/notify.c:716
-msgid "_Chat windows"
-msgstr "´ëÈ­ â(_C)"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
-msgid "Notification Methods"
-msgstr "¾Ë¸² ¹æ½Ä"
-
-#: plugins/notify.c:728
-msgid "Prepend _string into window title:"
-msgstr "â Á¦¸ñÁÙ¿¡ ¿Ã ¹®ÀÚ¿­(_S):"
-
-#: 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)"
-
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "´ëÈ­°¡ È°¼ºÈ­ µÇ¸é ¾Ë¸²(_N)"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
-msgid "Notification Removal"
-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)"
-
-#: plugins/notify.c:774
-msgid "Remove when _typing in conversation window"
-msgstr "´ëȭâ¿¡¼­ ¸Þ½ÃÁö¸¦ ÀÔ·ÂÇÏ¸é ¾ø¾Ú(_T)"
+#. *< 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
@@ -456,14 +644,123 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: 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:157
+msgid "Mail Checker"
+msgstr "¸ÞÀÏ °Ë»ç±â"
+
+#: plugins/mailchk.c:159
+msgid "Checks for new local mail."
+msgstr "»õ ·ÎÄà ¸ÞÀÏÀÌ ÀÖ´ÂÁö °Ë»çÇÕ´Ï´Ù."
+
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:572
+msgid "Notify For"
+msgstr "´ÙÀ½ °æ¿ì ¾Ë¸²"
+
+#: plugins/notify.c:576
+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)"
+
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:598
+msgid "Notification Methods"
+msgstr "¾Ë¸² ¹æ½Ä"
+
+#: plugins/notify.c:605
+msgid "Prepend _string into window title:"
+msgstr "â Á¦¸ñÁÙ¿¡ ¿Ã ¹®ÀÚ¿­(_S):"
+
+#. Count method button
+#: plugins/notify.c:624
+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 "â °ü¸®ÀÚ \"±ä±Þ(_U)\" ÈùÆ® ¼³Á¤"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
+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
+msgid "Remove when conversation window _receives click"
+msgstr "´ëȭâÀ» Ŭ¸¯Çϸé Áö¿ò(_R)"
+
+#. Remove on type button
+#: plugins/notify.c:662
+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
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "¸Þ½ÃÁö ¾Ë¸²"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#. *  description
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "ÀÐÁö ¾ÊÀº ¸Þ½ÃÁö¸¦ ¾Ë¸®´Â ¿©·¯ °¡Áö ¹æ½ÄÀ» Á¦°øÇÕ´Ï´Ù."
 
@@ -474,30 +771,81 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:531
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#. *< summary
+#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
-#: plugins/raw.c:151
-msgid "Raw"
-msgstr ""
-
-#: plugins/raw.c:153
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
 #: plugins/raw.c:154
+msgid "Raw"
+msgstr ""
+
+#: plugins/raw.c:156
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+#: plugins/raw.c:157
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr ""
+
+#: plugins/relnot.c:68
+#, fuzzy, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr "<b>»ç¿ëÀÚ:</b> %s<br>"
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+#, fuzzy
+msgid "New Version Available"
+msgstr "»ç¿ëÇÒ ¼ö ¾øÀ½"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/relnot.c:134
+#, fuzzy
+msgid "Release Notification"
+msgstr "¸Þ½ÃÁö ¾Ë¸²"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -505,14 +853,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:502
+#: plugins/signals-test.c:465
 msgid "Signals Test"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:505 plugins/signals-test.c:507
+#. *  description
+#: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -523,50 +872,108 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:30
+#: plugins/simple.c:31
 msgid "Simple Plugin"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/simple.c:33 plugins/simple.c:35
+#. *  description
+#: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr ""
 
-#: plugins/spellchk.c:402
+#: plugins/spellchk.c:412
 msgid "Text Replacements"
 msgstr "³»¿ë º¯È¯"
 
-#: plugins/spellchk.c:426
+#: plugins/spellchk.c:436
 msgid "You type"
 msgstr "ÀÔ·Â"
 
-#: plugins/spellchk.c:438
+#: plugins/spellchk.c:448
 msgid "You send"
 msgstr "º¸³¿"
 
-#: plugins/spellchk.c:464
+#: plugins/spellchk.c:474
 msgid "Add a new text replacement"
 msgstr "º¯È¯ÇÒ ³»¿ë ´õÇϱâ"
 
-#: plugins/spellchk.c:471
+#: plugins/spellchk.c:481
 msgid "You _type:"
 msgstr "ÀÔ·ÂÇÑ °Í(_T):"
 
-#: plugins/spellchk.c:485
+#: plugins/spellchk.c:495
 msgid "You _send:"
 msgstr "º¸³»´Â °Í(_S):"
 
-#: plugins/spellchk.c:525
+#: plugins/spellchk.c:535
 msgid "Text replacement"
 msgstr "³»¿ë º¯È¯"
 
-#: plugins/spellchk.c:527 plugins/spellchk.c:528
+#: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "»ç¿ëÀÚ Á¤ÀÇµÈ ±ÔÄ¢¿¡ µû¶ó ³»º¸³»´Â ¸Þ½ÃÁöÀÇ ³»¿ëÀ» º¯È¯ÇÕ´Ï´Ù."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:843
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:223
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:312
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+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
+#. *  description
+#: 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:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s´ÔÀÌ ÀÚ¸®¸¦ ºñ¿ü½À´Ï´Ù."
@@ -600,12 +1007,21 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "Ä£±¸°¡ ÀÚ¸®ºñ¿òÀ̳ª »ç¿ë¾ÈÇÔ¿¡¼­ µ¹¾Æ¿À°Å³ª ³ª°¥ ¶§ ´ëȭâ¿¡ ¾Ë¸³´Ï´Ù."
 
+#: plugins/tcl/tcl.c:350
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -613,26 +1029,27 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "Ä£±¸ Ç¥½Ã±â"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#. *  description
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Ä£±¸ ¸ñ·ÏÀÇ ¼öÆòÀ¸·Î È帣´Â ¹öÀü"
 
-#: plugins/timestamp.c:74
+#: plugins/timestamp.c:95
 msgid "iChat Timestamp"
 msgstr "iChat ŸÀÓ½ºÅÆÇÁ"
 
-#: plugins/timestamp.c:81
+#: plugins/timestamp.c:102
 msgid "Delay"
 msgstr "°£°Ý"
 
-#: plugins/timestamp.c:94
+#: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "Àû¿ë(_A)"
 
@@ -643,14 +1060,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:150
+#: plugins/timestamp.c:173
 msgid "Timestamp"
 msgstr "½Ã°£ Ç¥½Ã"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:153 plugins/timestamp.c:155
+#. *  description
+#: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "¸Å ºÐ¸¶´Ù iChat ½ºÅ¸ÀÏ·Î ´ëȭâ¿¡ ½Ã°£À» Ç¥½ÃÇÕ´Ï´Ù."
 
@@ -674,7 +1092,7 @@
 msgstr "¸Þ½ÅÀúâ¿¡ ½½¶óÀÌµå ¹Ù º¸À̱â(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:848
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
 msgid "Buddy List Window"
 msgstr "Ä£±¸¸ñ·Ïâ"
 
@@ -696,6 +1114,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -707,63 +1126,71 @@
 "\n"
 "* Note: ÀÌ Ç÷¯±×ÀÎÀº Win2000À̳ª WinXP¸¦ ÇÊ¿ä·ÎÇÕ´Ï´Ù."
 
-#: plugins/win32/winprefs/winprefs.c:348
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ ·±Å¸ÀÓ ¹öÀü"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:356
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "½ÃÀÛ"
 
-#: plugins/win32/winprefs/winprefs.c:357
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "À©µµ¿ì°¡ ½ÃÀÛµÉ ¶§ °ÔÀÓ ½ÇÇàÇϱâ(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1448
-#: src/gtkprefs.c:2294
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
+#: src/gtkprefs.c:2505
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï µµÅ· °¡´ÉÇÏ°Ô(_D)"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:371
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "µµÅ·µÈ Ä£±¸¸ñ·ÏÀ» Ç×»ó À§¿¡ ³õ±â(_B)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:381
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "Ä£±¸¸ñ·ÏâÀ» Ç×»ó À§¿¡ ³õ±â(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:897
-#: src/gtkprefs.c:2295
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
+#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "´ëÈ­"
 
-#: plugins/win32/winprefs/winprefs.c:387
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "¸Þ½ÃÁö°¡ µµÂøÇϸé À©µµ¿ì¸¦ ±ôºýÀÌ°Ô(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:405
 msgid "WinGaim Options"
 msgstr "À©°ÔÀÓ ¿É¼Ç"
 
-#: plugins/win32/winprefs/winprefs.c:411 plugins/win32/winprefs/winprefs.c:412
+#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
 msgid "Options specific to Windows Gaim."
 msgstr "À©µµ¿ì °ÔÀÓÀÇ ¿É¼ÇÀ» Á¤ÇÕ´Ï´Ù."
 
-#: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
+#: src/about.c:59
+#, fuzzy
+msgid "About Gaim"
 msgstr "°ÔÀÓ(v%s)Àº"
 
-#: src/about.c:89
+#: src/about.c:74
+#, fuzzy, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">¸ÞÀÏÀ» ¹Þ¾Ò½À´Ï´Ù!</span>\n"
+"\n"
+"%s"
+
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -773,219 +1200,316 @@
 "¿øÇÏ´Â ¸ðµâ ±â¹ÝÀÇ ¸Þ½ÅÀúÀÔ´Ï´Ù.  Gtk+¸¦ ÀÌ¿ëÇÏ¿© ¸¸µé¾îÁ³À¸¸ç GPL ¶óÀ̼¾½º"
 "¸¦ µû¸¨´Ï´Ù.<BR><BR>"
 
-#: src/about.c:99
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-
 #: src/about.c:104
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "È°µ¿ÁßÀÎ °³¹ßÀÚ"
 
-#: src/about.c:105
+#: src/about.c:110
 msgid "maintainer"
 msgstr "°ü¸®ÀÚ"
 
-#: src/about.c:107
+#: src/about.c:112
 msgid "lead developer"
 msgstr "¼ö¼® °³¹ßÀÚ"
 
-#: src/about.c:110
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "°³¹ßÀÚ & À¥¸¶½ºÅÍ"
 
-#: src/about.c:111
+#: src/about.c:116
 msgid "win32 port"
 msgstr "WIN32 Æ÷ÆÃ"
 
-#: src/about.c:114 src/about.c:115
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "°³¹ßÀÚ"
 
-#: src/about.c:116
+#: src/about.c:122
 msgid "support"
 msgstr "Áö¿ø"
 
-#: src/about.c:123
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "¿­Á¤ÀûÀÎ ÆÐÄ¡ ÀúÀÚ"
 
-#: src/about.c:135
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "¿¹Àü °³¹ßÀÚ"
 
-#: src/about.c:136
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "¿¹Àü libfaim °ü¸®ÀÚ"
 
-#: src/about.c:137
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "¿¹Àü ¼ö¼® °³¹ßÀÚ"
 
-#: src/about.c:140
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "¿¹Àü °ü¸®ÀÚ"
 
-#: src/about.c:141
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "¿¹Àü Àç¹ö(Jabber) °³¹ßÀÚ"
 
-#: src/about.c:142
+#: src/about.c:151
 msgid "original author"
 msgstr "ÃÖÃÊ ÀúÀÚ"
 
-#: src/about.c:145
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "ÇØÄ¿¿Í °ø½ÄÀûÀÎ Å×½ºÅÍ [lazy bum]"
 
-#: src/about.c:153
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "ÇöÀç ¹ø¿ªÀÚ"
 
-#: src/about.c:154 src/about.c:180
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "Ä«Å»¸®¾Æ¾î"
 
-#: src/about.c:155 src/about.c:181
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "üÄÚ¾î"
 
-#: src/about.c:156
+#: src/about.c:165
 msgid "Danish"
 msgstr "µ§¸¶Å©¾î"
 
-#: src/about.c:157 src/about.c:182
+#: src/about.c:166
+msgid "British English"
+msgstr ""
+
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "µ¶ÀϾî"
 
-#: src/about.c:158 src/about.c:183
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "½ºÆäÀξî"
 
-#: src/about.c:159 src/about.c:184
+#: src/about.c:169 src/about.c:201
+#, fuzzy
+msgid "Finnish"
+msgstr "µ§¸¶Å©¾î"
+
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "ÇÁ¶û½º¾î"
 
-#: src/about.c:160
+#: src/about.c:171
 msgid "Hindi"
 msgstr "ÈùµÎ¾î"
 
-#: src/about.c:161
+#: src/about.c:172
 msgid "Hungarian"
 msgstr "Çë°¡¸®¾î"
 
-#: src/about.c:162 src/about.c:186
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "ÀÌÅ»¸®¾Æ¾î"
 
-#: src/about.c:163 src/about.c:188
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "Çѱ¹¾î"
 
-#: src/about.c:164
+#: src/about.c:175
 msgid "Dutch; Flemish"
 msgstr "³×µ¨¶õµå¾î; Flemish"
 
-#: src/about.c:165
-msgid "Portuguese-Brazil"
-msgstr "Æ÷¸£Åõ°¥¾î(ºê¶óÁú)"
-
-#: src/about.c:166
-msgid "Romanian"
-msgstr "·ç¸¶´Ï¾Æ¾î"
-
-#: src/about.c:167
-msgid "Serbian"
-msgstr "¼¼¸£ºñ¾Æ¾î"
-
-#: src/about.c:168 src/about.c:193
-msgid "Swedish"
-msgstr "½º¿þµ§¾î"
-
-#: src/about.c:169
-msgid "Simplified Chinese"
-msgstr "Áß±¹¾î(°£Ã¼)"
-
-#: src/about.c:170
-msgid "Traditional Chinese"
-msgstr "Áß±¹¾î(¹øü)"
+#: src/about.c:176
+msgid "Macedonian"
+msgstr ""
 
 #: src/about.c:177
-msgid "Past Translators"
-msgstr "¿¹Àü ¹ø¿ªÀÚ"
-
-#: src/about.c:178
-msgid "Amharic"
-msgstr "¿¡Æ¼¿ÀÇǾƾî"
-
-#: src/about.c:179
-msgid "Bulgarian"
-msgstr "ºÒ°¡¸®¾Æ¾î"
-
-#: src/about.c:185
-msgid "Hebrew"
-msgstr "È÷ºê·ç¾î"
-
-#: src/about.c:187
-msgid "Japanese"
-msgstr "ÀϺ»¾î"
-
-#: src/about.c:189
 msgid "Norwegian"
 msgstr "³ë¸£¿þÀ̾î"
 
-#: src/about.c:190
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "Æú·£µå¾î"
 
-#: src/about.c:191
+#: src/about.c:179
+#, fuzzy
+msgid "Portuguese"
+msgstr "Æ÷¸£Åõ°¥¾î(ºê¶óÁú)"
+
+#: src/about.c:180
+msgid "Portuguese-Brazil"
+msgstr "Æ÷¸£Åõ°¥¾î(ºê¶óÁú)"
+
+#: src/about.c:181
+msgid "Romanian"
+msgstr "·ç¸¶´Ï¾Æ¾î"
+
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "·¯½Ã¾Æ¾î"
 
-#: src/about.c:192
+#: src/about.c:183
+msgid "Serbian"
+msgstr "¼¼¸£ºñ¾Æ¾î"
+
+#: src/about.c:184 src/about.c:210
+msgid "Swedish"
+msgstr "½º¿þµ§¾î"
+
+#: src/about.c:185
+#, fuzzy
+msgid "Vietnamese"
+msgstr "ÆÄÀϸí"
+
+#: src/about.c:185
+msgid "Gnome Vi Team"
+msgstr ""
+
+#: src/about.c:186
+msgid "Simplified Chinese"
+msgstr "Áß±¹¾î(°£Ã¼)"
+
+#: src/about.c:187
+msgid "Traditional Chinese"
+msgstr "Áß±¹¾î(¹øü)"
+
+#: src/about.c:194
+msgid "Past Translators"
+msgstr "¿¹Àü ¹ø¿ªÀÚ"
+
+#: src/about.c:195
+msgid "Amharic"
+msgstr "¿¡Æ¼¿ÀÇǾƾî"
+
+#: src/about.c:196
+msgid "Bulgarian"
+msgstr "ºÒ°¡¸®¾Æ¾î"
+
+#: src/about.c:203
+msgid "Hebrew"
+msgstr "È÷ºê·ç¾î"
+
+#: src/about.c:205
+msgid "Japanese"
+msgstr "ÀϺ»¾î"
+
+#: src/about.c:209
 msgid "Slovak"
 msgstr "½½·Î¹ÙÅ°¾Æ¾î"
 
-#: src/about.c:194
+#: src/about.c:211
 msgid "Chinese"
 msgstr "Áß±¹¾î"
 
-#: 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/away.c:207
-msgid "Gaim - Away!"
-msgstr "°ÔÀÓ - ÀÚ¸®ºñ¿ò!"
-
-#: src/away.c:268
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
+msgid "New passwords do not match."
+msgstr "»õ Æнº¿öµå°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: src/account.c:288
+msgid "Fill out all fields completely."
+msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì¼¼¿ä."
+
+#: src/account.c:313
+#, fuzzy
+msgid "Original password"
+msgstr "¿¹Àü ºñ¹Ð¹øÈ£"
+
+#: src/account.c:320
+#, fuzzy
+msgid "New password"
+msgstr "»õ ºñ¹Ð¹øÈ£"
+
+#: src/account.c:327
+#, fuzzy
+msgid "New password (again)"
+msgstr "»õ ºñ¹Ð¹øÈ£ (´Ù½Ã)"
+
+#: src/account.c:333
+#, fuzzy, c-format
+msgid "Change password for %s"
+msgstr "%sÀÇ ºñ¹Ð¹øÈ£ ¹Ù²Ù±â:"
+
+#: src/account.c:341
+#, 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:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+msgid "OK"
+msgstr "È®ÀÎ"
+
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
+msgid "Cancel"
+msgstr "Ãë¼Ò"
+
+#: src/account.c:374
+#, fuzzy, c-format
+msgid "Change user information for %s"
+msgstr "»ç¿ëÀÚÀÇ Á¤º¸ °¡Á®¿À±â"
+
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+msgid "Save"
+msgstr "ÀúÀå"
+
+#: src/away.c:210
+#, fuzzy
+msgid "Away!"
+msgstr "ÀÚ¸®ºñ¿ò"
+
+#: src/away.c:275
 msgid "I'm Back!"
 msgstr "µ¹¾Æ¿Ô´Ù!"
 
-#: src/away.c:366
+#: src/away.c:375
 msgid "New Away Message"
 msgstr "»õ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
-#: src/away.c:386
+#: src/away.c:395
 msgid "Remove Away Message"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö Áö¿ò"
 
-#: src/away.c:581
+#: src/away.c:590
 msgid "Set All Away"
 msgstr "¸ðµç ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö »ç¿ë"
 
-#: src/blist.c:440 src/gtkprefs.c:2297
+#: src/blist.c:590 src/gtkprefs.c:2508
 msgid "Chats"
 msgstr "äÆÃ"
 
-#. 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:764
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -994,205 +1518,119 @@
 "%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] ""
-"%2$s ±×·ìÀÇ %1$d¸íÀº °èÁ¤ÀÌ ¿¬°áµÇÁö ¾ÊÀº °ü°è·Î Áö¿öÁöÁö ¾Ê¾Ò½À´Ï´Ù. Ä£±¸¿Í ±×·ì"
-"ÀÌ ¸ðµÎ Áö¿öÁöÁö ¾Ê¾Ò½À´Ï´Ù.\n"
-
-#: src/blist.c:773
+"%2$s ±×·ìÀÇ %1$d¸íÀº °èÁ¤ÀÌ ¿¬°áµÇÁö ¾ÊÀº °ü°è·Î Áö¿öÁöÁö ¾Ê¾Ò½À´Ï´Ù. Ä£±¸¿Í "
+"±×·ìÀÌ ¸ðµÎ Áö¿öÁöÁö ¾Ê¾Ò½À´Ï´Ù.\n"
+
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr "±×·ìÀÌ Áö¿öÁöÁö ¾ÊÀ½"
 
-#: src/blist.c:811 src/gtkaccount.c:140 src/gtkpounce.c:307 src/gtkutils.c:843
-#: src/protocols/jabber/jabber.c:1171
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
 msgid "Unknown"
 msgstr "¾Ë·ÁÁöÁö ¾ÊÀ½"
 
-#: src/blist.c:1037
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "À߸øµÈ ±×·ì À̸§"
 
-#: src/blist.c:1794
+#: src/blist.c:2220
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "³» Ä£±¸ ¸ñ·Ï ÆÄ½Ì Áß¿¡ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù. ·ÎµåµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/blist.c:1796
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "Ä£±¸ ¸ñ·Ï ¿À·ù"
 
-#. 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."
-msgstr "ÇöÀç äÆÃÀ» ÇÒ ¼ö ÀÖ´Â ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù."
-
-#: src/buddy_chat.c:330
-msgid "Join Chat"
-msgstr "äÆà Âü¿©"
-
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr "äÆÃ"
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr "äÆà Âü¿©½Ã º°¸í:"
-
-#. Join button.
-#: src/buddy_chat.c:369
-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
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%sÀº(´Â) À߸øµÈ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎÀÔ´Ï´Ù."
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "°¡ÀÔ ¿À·ù"
 
-#: src/connection.c:170 src/gtkconn.c:278
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "¿¬°á ¿À·ù"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "%sÀÇ ºñ¹Ð¹øÈ£¸¦ ³ÖÀ¸¼¼¿ä"
 
-#. 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
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù. ¸Þ½ÃÁö°¡ ³Ê¹« Å®´Ï´Ù."
 
-#: src/conversation.c:432
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/conversation.c:1955
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡ µé¾î¿Ô½À´Ï´Ù."
 
-#: src/conversation.c:1958
+#: src/conversation.c:1972
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>]´ÔÀÌ ´ëÈ­½Ç¿¡ µé¾î¿Ô½À´Ï´Ù."
 
-#: src/conversation.c:2043
+#: src/conversation.c:2064
+#, fuzzy, c-format
+msgid "You are now known as %s"
+msgstr "%s´ÔÀÌ %s(À¸)·Î ´ëÈ­¸íÀ» ¹Ù²å½À´Ï´Ù."
+
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s´ÔÀÌ %s(À¸)·Î ´ëÈ­¸íÀ» ¹Ù²å½À´Ï´Ù."
 
-#: src/conversation.c:2085
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡¼­ ³ª°¬½À´Ï´Ù. (%s)"
 
-#: src/conversation.c:2087
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡¼­ ³ª°¬½À´Ï´Ù."
 
-#: src/conversation.c:2160
+#: src/conversation.c:2185
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d ¸Þ½ÃÁö)"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2187
 #, c-format
 msgid " left the room (%s)."
 msgstr "´ëÈ­½Ç¿¡¼­ ³ª°¬½À´Ï´Ù (%s)."
 
-#: src/conversation.c:2444
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr "¸¶Áö¸·À¸·Î ¸¸µé¾îÁø â"
 
-#: src/conversation.c:2446
+#: src/conversation.c:2469 src/gtkprefs.c:1413
 msgid "New window"
 msgstr "ț ̢"
 
-#: src/conversation.c:2448
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "±×·ìÀ¸·Î"
 
-#: src/conversation.c:2450
+#: src/conversation.c:2473
 msgid "By account"
 msgstr "°èÁ¤À¸·Î"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "»ç¿ëÀÚ °æ°í"
 
-#: src/dialogs.c:338
-msgid "_Warn"
-msgstr "°æ°í(_W)"
-
 # c-format
-#: src/dialogs.c:354
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1204,454 +1642,177 @@
 "\n"
 "ÀÌ°ÍÀº %s´ÔÀÇ °æ°í ´Ü°è¸¦ Áõ°¡½ÃÅ°°í ÇÑ°è ºñÀ²À» ¾ö°ÝÇÏ°Ô Àû¿ëÇÒ °ÍÀÔ´Ï´Ù.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "À͸íÀ¸·Î °æ°í¸¦ º¸³¾±î¿ä(_A)?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>ÀÍ¸í °æ°í´Â ¹®Á¦¸¦ ´ú ÀÏÀ¸Å³ ¼ö ÀÖ½À´Ï´Ù.</b>"
 
-#: src/dialogs.c:449
+#: src/dialogs.c:301
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s´ÔÀ» Ä£±¸ ¸ñ·Ï¿¡¼­ »èÁ¦ÇÕ´Ï´Ù. °è¼ÓÇÒ±î¿ä?"
 
-#: src/dialogs.c:451 src/dialogs.c:452
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "Ä£±¸ Áö¿ì±â"
 
-#: src/dialogs.c:461
+#: src/dialogs.c:313
 #, 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:463 src/dialogs.c:464
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "äÆà Áö¿ì±â"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:325
 #, 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:476 src/dialogs.c:477
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "±×·ì Áö¿ì±â"
 
-#: src/dialogs.c:624
-msgid "New Message"
-msgstr "»õ ¸Þ½ÃÁö"
-
-#: src/dialogs.c:642
-msgid "Please enter the screenname of the person you would like to IM.\n"
+#: src/dialogs.c:346
+#, 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:349 src/dialogs.c:350
+#, fuzzy
+msgid "Remove Contact"
+msgstr "äÆà Áö¿ì±â"
+
+#: src/dialogs.c:453 src/dialogs.c:509
+#, fuzzy
+msgid "_Screen name"
+msgstr "¾ÆÀ̵ð(_S)"
+
+#: src/dialogs.c:459 src/dialogs.c:515
+#, fuzzy
+msgid "_Account"
+msgstr "°èÁ¤(_A):"
+
+#: src/dialogs.c:466
+#, fuzzy
+msgid "New Instant Message"
+msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú"
+
+#: src/dialogs.c:468
+#, fuzzy
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr "¸Þ½ÅÀú·Î º¸³»·Á´Â »ó´ëÀÇ ¾ÆÀ̵𸦠³Ö¾î ÁֽʽÿÀ.\n"
 
-#: src/dialogs.c:658 src/dialogs.c:735
-msgid "_Screenname:"
-msgstr "¾ÆÀ̵ð(_S):"
-
-#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
-msgid "_Account:"
-msgstr "°èÁ¤(_A):"
-
-#: src/dialogs.c:704
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸ º¸±â"
 
-#: src/dialogs.c:723
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
+#: src/dialogs.c:524
+#, fuzzy
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr "Á¤º¸¸¦ º¸±æ ¿øÇÏ´Â »ç¶÷ÀÇ ¾ÆÀ̵𸦠³ÖÀ¸¼¼¿ä.\n"
 
-#: 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:1706
-#, c-format
-msgid "Changing info for %s:"
-msgstr "%sÀÇ Á¤º¸ ¹Ù²Ù±â:"
-
-#: src/dialogs.c:1793
-msgid "Below are the results of your search: "
-msgstr ""
-
-#: src/dialogs.c:1904
-msgid "Log Conversation"
-msgstr "´ëÈ­ ±â·Ï"
-
-#: 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:2218
-msgid "Insert"
-msgstr "»ðÀÔ"
-
-#: 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:2261 src/protocols/jabber/jabber.c:3631
-msgid "URL"
-msgstr ""
-
-#: src/dialogs.c:2271 src/gtkprefs.c:604 src/gtkprefs.c:1843
-#: src/protocols/jabber/jabber.c:3645
-msgid "Description"
-msgstr "¼³¸í"
-
-#: src/dialogs.c:2406 src/dialogs.c:2423
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "±ÛÀÚ »ö±ò ¼±ÅÃ"
 
-#: src/dialogs.c:2458 src/dialogs.c:2475
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "±ÛÀÚ ¹ÙÅÁ»ö ¼±ÅÃ"
 
-#: src/dialogs.c:2572 src/dialogs.c:2598
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
-#: src/dialogs.c:2664
+#: src/dialogs.c:692
 msgid "You cannot save an away message with a blank title"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁöÀÇ Á¦¸ñÀº ºñ¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: src/dialogs.c:2666
+#: src/dialogs.c:694
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "¸Þ½ÃÁö ŸÀÌƲÀ» ³Ö°Å³ª ÀúÀå ¾øÀÌ »ç¿ëÇϽ÷Á¸é \"»ç¿ë\"À» ´©¸£¼¼¿ä."
 
-#: src/dialogs.c:2676
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö´Â ºñ¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: src/dialogs.c:2741 src/dialogs.c:2749
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr "»õ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
-#: src/dialogs.c:2759
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr "ÀÚ¸®ºñ¿ò Á¦¸ñ: "
 
-#: src/dialogs.c:2804
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "ÀúÀå ¹× »ç¿ë"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "»ç¿ë"
 
-#. show everything
-#: src/dialogs.c:2957
-msgid "Smile!"
-msgstr "¿ô¾î¿ä!"
-
-#: src/dialogs.c:2975
+#: src/dialogs.c:868
 msgid "Alias Chat"
 msgstr "äÆà º°Äª"
 
-#: src/dialogs.c:2975
-msgid "Alias chat"
-msgstr "äÆà º°Äª"
-
-#: src/dialogs.c:2976
-msgid "Please enter an aliased name for this chat."
+#: src/dialogs.c:869
+#, fuzzy
+msgid "Enter an alias for this chat."
 msgstr "ÀÌ ´ëÈ­¿¡¼­ »ç¿ëÇÒ º°ÄªÀ» ÀÔ·ÂÇϼ¼¿ä."
 
-#: src/dialogs.c:3007
-msgid "_Screenname"
-msgstr "¾ÆÀ̵ð(_S)"
-
-#: src/dialogs.c:3011 src/gtkblist.c:432 src/gtkblist.c:479
-msgid "_Alias"
-msgstr "º°Äª(_A)"
-
-#: src/dialogs.c:3015
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+msgid "Alias"
+msgstr "º°Äª"
+
+#: src/dialogs.c:885
+#, fuzzy
+msgid "Alias Contact"
+msgstr "äÆà º°Äª"
+
+#: src/dialogs.c:886
+#, fuzzy
+msgid "Enter an alias for this contact."
+msgstr "ÀÌ ´ëÈ­¿¡¼­ »ç¿ëÇÒ º°ÄªÀ» ÀÔ·ÂÇϼ¼¿ä."
+
+#: src/dialogs.c:903
+#, fuzzy, c-format
+msgid "Enter an alias for %s."
+msgstr "%sÀÇ ºñ¹Ð¹øÈ£¸¦ ³ÖÀ¸¼¼¿ä"
+
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr "Ä£±¸ º°Äª"
 
-#: src/dialogs.c:3016
-msgid "Alias buddy"
-msgstr "Ä£±¸ º°Äª"
-
-#: src/dialogs.c:3017
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"³» Ä£±¸ ¸ñ·Ï¿¡¼­ »ç¿ëÇÒ ¾Æ·¡ »ç¿ëÀÚÀÇ º°ÄªÀ» ÀÔ·ÂÇϰųª ÀÌ ¿¬°áÀÇ À̸§À» ¹Ù²Ù"
-"¼¼¿ä."
-
-#: src/dialogs.c:3053 src/dialogs.c:3060
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "%s¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù."
-
-#: src/dialogs.c:3084
-msgid "Save Log File"
-msgstr "·Î±×ÆÄÀÏ ÀúÀå"
-
-#: src/dialogs.c:3114
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "%s ÆÄÀÏÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù."
-
-#: src/dialogs.c:3133
-msgid "Clear Log"
-msgstr "·Î±× ºñ¿ì±â"
-
-#: src/dialogs.c:3142
-msgid "Really clear log?"
-msgstr "Á¤¸»·Î ·Î±×¸¦ Áö¿ï±î¿ä?"
-
-#: src/dialogs.c:3187 src/dialogs.c:3358
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "·Î±× ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù."
-
-#: src/dialogs.c:3335
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s´Ô°úÀÇ ´ëÈ­"
-
-#: src/dialogs.c:3337
-msgid "System Log"
-msgstr "½Ã½ºÅÛ ·Î±×"
-
-#: src/dialogs.c:3379
-msgid "Date"
-msgstr "³¯Â¥"
-
-#: src/dialogs.c:3436
-msgid "Log"
-msgstr "·Î±×"
-
-#: 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
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s Àº(/´Â) À߸øµÈ ÆÄÀϸíÀÔ´Ï´Ù.\n"
 
-#: src/ft.c:137
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½.\n"
 
-#: src/ft.c:693
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "%s´Ô¿¡°Ô ÆÄÀÏ Àü¼ÛÀ» Ãë¼ÒÇÕ´Ï´Ù.\n"
 
-#: src/ft.c:695
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s´Ô¿¡°Ô¼­ ÆÄÀÏ ¼ö½ÅÀ» Ãë¼ÒÇÕ´Ï´Ù.\n"
@@ -1664,7 +1825,7 @@
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1677,30 +1838,31 @@
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr "°ÔÀÓÀÌ ½ÇÇàµÇ°í ÀÖÁö ¾ÊÀ½ (on session 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:203
+#, fuzzy
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1722,39 +1884,34 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...³» Ä£±¸ ¸ñ·Ï¿¡ 'Penguin'À» ´õÇÕ´Ï´Ù.\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:369 src/gaimrc.c:1458
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1265 src/gtkblist.c:1410
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "¾ËÆĺª ¼ø"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1411
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "»óÅÂ ¼ø"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1412
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "·Î±× Å©±â ¼ø"
 
-#: src/gaimrc.c:1556
-#, c-format
-msgid "Could not open config file %s."
-msgstr "¼³Á¤ ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù."
-
-#: src/gtkaccount.c:253
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1765,308 +1922,411 @@
 "<b>ÆÄÀÏ Å©±â:</b> %s\n"
 "<b>À̹ÌÁö Å©±â:</b> %dx%d"
 
-#: src/gtkaccount.c:278 src/protocols/oscar/oscar.c:3085
-msgid "Buddy Icon"
-msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
-
 #. Build the login options frame.
-#: src/gtkaccount.c:328
+#: src/gtkaccount.c:384
 msgid "Login Options"
 msgstr "·Î±ä ¿É¼Ç"
 
-#: src/gtkaccount.c:345
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr "ÇÁ·ÎÅäÄÝ:"
 
-#: src/gtkaccount.c:350
-msgid "Screenname:"
-msgstr "¾ÆÀ̵ð:"
-
-#: src/gtkaccount.c:423 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
+msgid "Screen Name:"
+msgstr "¾ÆÀ̵ð: "
+
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "ºñ¹Ð¹øÈ£:"
 
-#: src/gtkaccount.c:432
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+msgid "Alias:"
+msgstr "º°Äª:"
+
+#: src/gtkaccount.c:488
 msgid "Remember password"
 msgstr "ºñ¹Ð¹øÈ£ ±â¾ïÇϱâ"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:542
 msgid "User Options"
 msgstr "»ç¿ëÀÚ ¿É¼Ç"
 
-#: src/gtkaccount.c:499
+#: src/gtkaccount.c:555
 msgid "New mail notifications"
 msgstr "»õ ¸ÞÀÏ ¾Ë¸²"
 
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:564
 msgid "Buddy icon file:"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ ÆÄÀÏ:"
 
-#: src/gtkaccount.c:517
+#: src/gtkaccount.c:574
 msgid "_Browse"
 msgstr "ã¾Æº¸±â(_B)"
 
-#: src/gtkaccount.c:523
+#: src/gtkaccount.c:580
 msgid "_Reset"
 msgstr "µÇµ¹¸®±â(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:584
+#: src/gtkaccount.c:642
 #, c-format
 msgid "%s Options"
 msgstr "%s ¿É¼Ç"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:705
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "±âº» ÇÁ·Ï½Ã ¼³Á¤ »ç¿ëÇϱâ"
 
 #. No Proxy
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë ¾ÈÇÔ"
 
 #. HTTP
-#: src/gtkaccount.c:719
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr ""
 
 #. SOCKS 4
-#: src/gtkaccount.c:726
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:740 src/gtkprefs.c:1107
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
 msgid "Use Environmental Settings"
 msgstr "±âº»È¯°æ ¼³Á¤ »ç¿ëÇϱâ"
 
-#: src/gtkaccount.c:773
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:777
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:919
 msgid "Proxy Options"
 msgstr "ÇÁ·Ï½Ã ¿É¼Ç"
 
-#: src/gtkaccount.c:809 src/gtkprefs.c:1101
+#: src/gtkaccount.c:937 src/gtkprefs.c:1208
 msgid "Proxy _type:"
 msgstr "ÇÁ·Ï½Ã Á¾·ù(_T):"
 
-#: src/gtkaccount.c:818
+#: src/gtkaccount.c:946 src/gtkprefs.c:1238
 msgid "_Host:"
 msgstr "È£½ºÆ®(_H):"
 
-#: src/gtkaccount.c:822
+#: src/gtkaccount.c:950 src/gtkprefs.c:1256
 msgid "_Port:"
 msgstr "Æ÷Æ®(_P):"
 
-#: src/gtkaccount.c:830
+#: src/gtkaccount.c:958
 msgid "_Username:"
 msgstr "»ç¿ëÀÚÀ̸§(_U):"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:963 src/gtkprefs.c:1293
 msgid "Pa_ssword:"
 msgstr "ºñ¹Ð¹øÈ£(_S):"
 
-#: src/gtkaccount.c:1164
+#: src/gtkaccount.c:1331
 msgid "Add Account"
 msgstr "°èÁ¤ ´õÇϱâ"
 
-#: src/gtkaccount.c:1166
+#: src/gtkaccount.c:1333
 msgid "Modify Account"
 msgstr "°èÁ¤ °íÄ¡±â"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1357
 msgid "Show more options"
 msgstr "ÀÚ¼¼ÇÑ ¿É¼Ç º¸±â"
 
-#: src/gtkaccount.c:1191
+#: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr "°£·«ÇÑ ¿É¼Ç º¸±â"
 
 #. Register button
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "°¡ÀÔ"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Á¤¸» %sÀ»(¸¦) Áö¿ï±î¿ä?"
 
-#: src/gtkaccount.c:1500 src/gtkrequest.c:192
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Áö¿ì±â"
 
-#. 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
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+msgid "Screen Name"
+msgstr "¾ÆÀ̵ð"
+
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "¿¬°á"
 
-#: src/gtkaccount.c:1619
+#: src/gtkaccount.c:1898
 msgid "Protocol"
 msgstr "ÇÁ·ÎÅäÄÝ"
 
-#: src/gtkblist.c:413
-msgid "Add a _Buddy"
-msgstr "Ä£±¸ ´õÇϱâ(_B)"
-
-#: src/gtkblist.c:415
-msgid "Add a C_hat"
-msgstr "äÆà ´õÇϱâ(_H)"
-
-#: src/gtkblist.c:417
-msgid "_Delete Group"
-msgstr "±×·ì Áö¿ì±â(_D)"
-
-#: src/gtkblist.c:419
-msgid "_Rename"
-msgstr "À̸§ ¹Ù²Ù±â(_R)"
-
-#: src/gtkblist.c:427
-msgid "_Join"
-msgstr "Âü¿©(_J)"
-
-#: src/gtkblist.c:429
-msgid "Auto-Join"
-msgstr "ÀÚµ¿ Âü¿©"
-
-#: src/gtkblist.c:434 src/gtkblist.c:481
+#: src/gtkaccount.c:2210
+#, 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:2224
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"³» Ä£±¸ ¸ñ·Ï¿¡ ´õÇÒ±î¿ä?"
+
+#: src/gtkaccount.c:2228
+#, fuzzy
+msgid "Information"
+msgstr "Á÷Àå Á¤º¸"
+
+#: src/gtkaccount.c:2232
+msgid "Add buddy to your list?"
+msgstr "³» Ä£±¸ ¸ñ·Ï¿¡ Ä£±¸¸¦ ´õÇÒ±î¿ä?"
+
+#. Add button
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
+#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+msgid "Add"
+msgstr "´õÇϱâ"
+
+#: src/gtkblist.c:801 src/gtkblist.c:4236
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "ÇöÀç äÆÃÀ» ÇÒ ¼ö ÀÖ´Â ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù."
+
+#: src/gtkblist.c:814
+#, fuzzy
+msgid "Join a Chat"
+msgstr "äÆà Âü¿©"
+
+#: src/gtkblist.c:835
+#, fuzzy
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "º°Äª°ú ¸ñ·Ï¿¡ ´õÇÒ ´ëÈ­½Ç¿¡ ¾Ë¸ÂÀº ¼³¸íÀ» ³ÖÀ¸¼¼¿ä.\n"
+
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "°èÁ¤(_A):"
+
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#, fuzzy
+msgid "Get _Info"
+msgstr "Á¤º¸ º¸±â"
+
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#, fuzzy
+msgid "I_M"
+msgstr "¸Þ½ÃÁö"
+
+#: src/gtkblist.c:1092
+msgid "Add Buddy _Pounce"
+msgstr "Ä£±¸¾Ë¸² ´õÇϱâ(_P)"
+
+#: src/gtkblist.c:1094
+msgid "View _Log"
+msgstr "Áö³­ ´ëÈ­ º¸±â(_L)"
+
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#, fuzzy
+msgid "_Alias..."
+msgstr "º°Äª(_A)"
+
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkconn.c:361
 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)"
+#: src/gtkblist.c:1206
+msgid "Add a _Buddy"
+msgstr "Ä£±¸ ´õÇϱâ(_B)"
+
+#: src/gtkblist.c:1208
+msgid "Add a C_hat"
+msgstr "äÆà ´õÇϱâ(_H)"
+
+#: src/gtkblist.c:1210
+msgid "_Delete Group"
+msgstr "±×·ì Áö¿ì±â(_D)"
+
+#: src/gtkblist.c:1212
+msgid "_Rename"
+msgstr "À̸§ ¹Ù²Ù±â(_R)"
+
+#. join button
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
+msgid "_Join"
+msgstr "Âü¿©(_J)"
+
+#: src/gtkblist.c:1240
+msgid "Auto-Join"
+msgstr "ÀÚµ¿ Âü¿©"
+
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
+msgid "_Collapse"
+msgstr ""
+
+#: src/gtkblist.c:1307
+msgid "_Expand"
+msgstr ""
+
+#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#, fuzzy
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "ÇöÀç äÆÃÀ» ÇÒ ¼ö ÀÖ´Â ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù."
 
 #. Buddies menu
-#: src/gtkblist.c:785
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr "/Ä£±¸(_B)"
 
-#: src/gtkblist.c:786
-msgid "/Buddies/New _Instant Message..."
+#: src/gtkblist.c:2313
+#, fuzzy
+msgid "/Buddies/New Instant _Message..."
 msgstr "/Ä£±¸(B)/»õ ¸Þ½ÃÁö(_I)..."
 
-#: src/gtkblist.c:787
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Ä£±¸(B)/äÆÿ¡ Âü¿©Çϱâ(_C)..."
 
-#: src/gtkblist.c:788
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:2315
+#, fuzzy
+msgid "/Buddies/Get User _Info..."
 msgstr "/Ä£±¸(B)/»ç¿ëÀÚ Á¤º¸ º¸±â(_U)..."
 
-#: src/gtkblist.c:790
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Ä£±¸(B)/Á¢¼Ó¾ÈÇÑ Ä£±¸ º¸¿©ÁÖ±â(_O)"
 
-#: src/gtkblist.c:791
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Ä£±¸(B)/ºó ±×·ì º¸¿©ÁÖ±â(_E)"
 
-#: src/gtkblist.c:792
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:2319
+#, fuzzy
+msgid "/Buddies/_Add Buddy..."
 msgstr "/Ä£±¸(B)/Ä£±¸ ´õÇϱâ(_A)..."
 
-#: src/gtkblist.c:793
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:2320
+#, fuzzy
+msgid "/Buddies/Add C_hat..."
 msgstr "/Ä£±¸(B)/äÆÿ¡ Âü¿©Çϱâ(_H)..."
 
-#: src/gtkblist.c:794
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:2321
+#, fuzzy
+msgid "/Buddies/Add _Group..."
 msgstr "/Ä£±¸(B)/±×·ì ´õÇϱâ(_G)..."
 
-#: src/gtkblist.c:796
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/Ä£±¸(B)/²÷±â(_S)"
 
-#: src/gtkblist.c:797
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/Ä£±¸(B)/³ª°¡±â(_Q)"
 
 #. Tools
-#: src/gtkblist.c:800
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/µµ±¸(_T)"
 
-#: src/gtkblist.c:801
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr "/µµ±¸(T)/ÀÚ¸®ºñ¿ò(_A)"
 
-#: src/gtkblist.c:802
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr "/µµ±¸(T)/Ä£±¸¾Ë¸²(_P)"
 
-#: src/gtkblist.c:803
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/µµ±¸(T)/ÇÁ·ÎÅäÄÝ ¼¼ºÎ ¼³Á¤(_R)"
 
-#: src/gtkblist.c:805
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/µµ±¸(T)/°èÁ¤ ¼³Á¤(_C)"
 
-#: src/gtkblist.c:806
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:2333
+#, fuzzy
+msgid "/Tools/_File Transfers"
 msgstr "/µµ±¸(T)/ÆÄÀÏ Àü¼Û(_F)..."
 
-#: src/gtkblist.c:807
-msgid "/Tools/Preferences"
+#: src/gtkblist.c:2334
+#, fuzzy
+msgid "/Tools/R_oom List"
+msgstr "/µµ±¸(T)/ÇÁ·ÎÅäÄÝ ¼¼ºÎ ¼³Á¤(_R)"
+
+#: src/gtkblist.c:2335
+#, fuzzy
+msgid "/Tools/Pr_eferences"
 msgstr "/µµ±¸(T)/±âº» ¼³Á¤..."
 
-#: src/gtkblist.c:808
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/µµ±¸(T)/ÇÁ¶óÀ̹ö½Ã(_I)"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "/µµ±¸(T)/½Ã½ºÅÛ ·Î±× º¸±â(_L)"
 
 #. Help
-#: src/gtkblist.c:813
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/µµ¿ò¸»(_H)"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "/µµ¿ò¸»(H)/¿Â¶óÀÎ µµ¿ò¸»(_H)"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/µµ¿ò¸»(H)/µð¹ö±× â(_D)"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/µµ¿ò¸»(H)/°ÔÀÓÀº(_A)"
 
-#: src/gtkblist.c:850
+#: src/gtkblist.c:2360
+msgid "Rename Group"
+msgstr "±×·ì À̸§ ¹Ù²Ù±â"
+
+#: src/gtkblist.c:2360
+msgid "New group name"
+msgstr "»õ ±×·ì À̸§"
+
+#: src/gtkblist.c:2361
+msgid "Please enter a new name for the selected group."
+msgstr "¼±ÅÃµÈ ±×·ìÀÇ »õ À̸§À» ÀÔ·ÂÇϼ¼¿ä."
+
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
@@ -2075,16 +2335,16 @@
 "\n"
 "<b>°èÁ¤:</b> %s"
 
-#: src/gtkblist.c:900 src/protocols/oscar/oscar.c:5463
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr "<b>»óÅÂ:</b> ¿ÀÇÁ¶óÀÎ"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:926
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2092,7 +2352,16 @@
 "\n"
 "<b>°èÁ¤:</b>"
 
-#: src/gtkblist.c:927
+#: src/gtkblist.c:2485
+#, fuzzy
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>º°Äª:</b>"
+
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2100,7 +2369,7 @@
 "\n"
 "<b>º°Äª:</b>"
 
-#: src/gtkblist.c:928
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2108,7 +2377,14 @@
 "\n"
 "<b>´ëÈ­¸í:</b>"
 
-#: src/gtkblist.c:929
+#: src/gtkblist.c:2488
+#, fuzzy
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr "<b>Á¢¼Ó½Ã°£:</b> "
+
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2116,7 +2392,7 @@
 "\n"
 "<b>»ç¿ë¾ÈÇÔ:</b>"
 
-#: src/gtkblist.c:930
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2124,13 +2400,13 @@
 "\n"
 "<b>°æ°í:</b>"
 
-#: src/gtkblist.c:932
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:933
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2138,7 +2414,7 @@
 "\n"
 "<b>»óÅÂ</b>: Awesome"
 
-#: src/gtkblist.c:934
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2146,574 +2422,662 @@
 "\n"
 "<b>»óÅÂ</b>: Rockin"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "»ç¿ë¾ÈÇÔ (%d½Ã°£%02dºÐ)"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "»ç¿ë¾ÈÇÔ (%dºÐ)"
 
-#: src/gtkblist.c:1238
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "°æ°í (%d%%) "
 
-#: src/gtkblist.c:1241
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr "¿ÀÇÁ¶óÀÎ"
 
-#: src/gtkblist.c:1409 src/gtkprefs.c:845 src/gtkprefs.c:1538
-msgid "None"
-msgstr "º¸¿©ÁÖÁö ¾ÊÀ½"
-
-#: src/gtkblist.c:1472
+#: src/gtkblist.c:3032
 msgid "/Tools/Away"
 msgstr "/µµ±¸(T)/ÀÚ¸®ºñ¿ò"
 
-#: src/gtkblist.c:1475
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr "/µµ±¸(T)/Ä£±¸¾Ë¸²"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:3038
 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:1561
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Ä£±¸(B)/Á¢¼Ó¾ÈÇÑ Ä£±¸ º¸¿©ÁÖ±â"
 
-#: src/gtkblist.c:1563
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Ä£±¸(B)/ºó ±×·ì º¸¿©ÁÖ±â"
 
-#: src/gtkblist.c:1581 src/gtkconv.c:1073
-msgid "IM"
-msgstr "¸Þ½ÃÁö"
-
-#: src/gtkblist.c:1587
+#: src/gtkblist.c:3152
 msgid "Send a message to the selected buddy"
 msgstr "¼±ÅÃµÈ Ä£±¸¿¡°Ô ¸Þ½ÃÁö º¸³»±â"
 
-#: src/gtkblist.c:1590 src/protocols/napster/napster.c:531
-msgid "Get Info"
-msgstr "Á¤º¸ º¸±â"
-
-#: src/gtkblist.c:1596
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr "¼±ÅÃµÈ Ä£±¸ÀÇ Á¤º¸ °¡Á®¿À±â"
 
-#: src/gtkblist.c:1599 src/protocols/oscar/oscar.c:3094
-msgid "Chat"
+#: src/gtkblist.c:3164
+#, fuzzy
+msgid "_Chat"
 msgstr "´ëÈ­"
 
-#: src/gtkblist.c:1604
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "´ëÈ­½Ç¿¡ Âü¿©"
 
-#: src/gtkblist.c:1612
+#: src/gtkblist.c:3172
+#, fuzzy
+msgid "_Away"
+msgstr "ÀÚ¸®ºñ¿ò"
+
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö ¼³Á¤"
 
-#: src/gtkblist.c:2606
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+msgid "Add Buddy"
+msgstr "Ä£±¸ ´õÇϱâ"
+
+#: src/gtkblist.c:3932
+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"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
+msgid "Account:"
+msgstr "°èÁ¤:"
+
+#: src/gtkblist.c:4243
+msgid "Add Chat"
+msgstr "äÆà ´õÇϱâ"
+
+#: src/gtkblist.c:4266
+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:4345
+msgid "Add Group"
+msgstr "±×·ì ´õÇϱâ"
+
+#: src/gtkblist.c:4346
+msgid "Please enter the name of the group to be added."
+msgstr "´õÇÒ ±×·ìÀÇ À̸§À» ³ÖÀ¸¼¼¿ä."
+
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr "°¡´ÉÇÑ ÇൿÀÌ ¾øÀ½"
 
-#: src/gtkconn.c:57 src/gtkconn.c:241 src/gtkconn.c:252
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "¿Ï·á."
 
-#: src/gtkconn.c:136
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "¿¬°á: "
 
-#: src/gtkconn.c:194
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "¿¬°á"
 
-#: src/gtkconn.c:207
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "¸ðµÎ Ãë¼Ò"
 
-#: src/gtkconn.c:274
-#, c-format
-msgid "%s has been disconnected"
-msgstr "%sÀÇ ¿¬°áÀÌ ²÷±è"
-
-#: src/gtkconn.c:277
+#: src/gtkconn.c:361 src/gtkconn.c:593
+#, fuzzy
+msgid "_Reconnect"
+msgstr "ÀÚµ¿À¸·Î ´Ù½Ã ¿¬°á"
+
+#: src/gtkconn.c:557
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">¸ÞÀÏÀ» ¹Þ¾Ò½À´Ï´Ù!</span>\n"
+"\n"
+"%s"
+
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "ÀÌÀ¯°¡ ¾Ë·ÁÁöÁö ¾ÊÀ½."
 
-#: src/gtkconv.c:184
+#: src/gtkconn.c:598
+#, fuzzy
+msgid "Reconnect _All"
+msgstr "ÀÚµ¿À¸·Î ´Ù½Ã ¿¬°á"
+
+#: src/gtkconn.c:628
+#, fuzzy
+msgid "Time"
+msgstr "Á¦¸ñ"
+
+#: src/gtkconv.c:172
+#, fuzzy, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "%s´Ô°úÀÇ ´ëÈ­"
+
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr "°°Àº ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÔ"
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "Á¤¸» µ¤¾î ¾µ±î¿ä?"
 
-#: src/gtkconv.c:280
-msgid "Gaim - Insert Image"
-msgstr "°ÔÀÓ - ±×¸² »ðÀÔ"
-
-#: src/gtkconv.c:584
-msgid "Gaim - Invite Buddy Into Chat Room"
+#: src/gtkconv.c:505
+#, fuzzy
+msgid "Invite Buddy Into Chat Room"
 msgstr "°ÔÀÓ - ´ëÈ­½Ç·Î Ä£±¸¸¦ ÃÊ´ë"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:533
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:554
 msgid "_Buddy:"
 msgstr "Ä£±¸(_B):"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "¸Þ½ÃÁö(_M):"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:667
+#, fuzzy
+msgid "Find"
+msgstr "ÈùµÎ¾î"
+
+#: src/gtkconv.c:693
+#, fuzzy
+msgid "_Search for:"
+msgstr "Ä£±¸ ã±â"
+
+#: src/gtkconv.c:1071
+msgid "IM"
+msgstr "¸Þ½ÃÁö"
+
+#: src/gtkconv.c:1079
 msgid "Un-Ignore"
 msgstr "¹«½ÃÇÏÁö ¾ÊÀ½"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:777
+#: src/gtkconv.c:1081 src/gtkprefs.c:817
 msgid "Ignore"
 msgstr "¹«½Ã"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2974
+#: src/gtkconv.c:1090 src/gtkconv.c:3346
 msgid "Info"
 msgstr "Á¤º¸"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3399
+#: src/gtkconv.c:1099
 msgid "Get Away Msg"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö º¸±â"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2957 src/gtkconv.c:4105
-#: src/gtkrequest.c:194
+#. Remove button
+#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Áö¿ì±â"
 
-#: src/gtkconv.c:2188
+#: src/gtkconv.c:2201
+#, fuzzy
+msgid "Animate"
+msgstr "ÃÊ´ë"
+
+#: src/gtkconv.c:2206
+msgid "Hide Icon"
+msgstr "¾ÆÀÌÄÜ ¼û±è"
+
+#: src/gtkconv.c:2212
+msgid "Save Icon As..."
+msgstr "»õ À̸§À¸·Î ¾ÆÀÌÄÜ ÀúÀå..."
+
+#: src/gtkconv.c:2579
 msgid "User is typing..."
 msgstr "»ç¿ëÀÚ°¡ ÀÔ·ÂÁß..."
 
-#: src/gtkconv.c:2196
+#: src/gtkconv.c:2587
 msgid "User has typed something and paused"
 msgstr "»ç¿ëÀÚ°¡ ¹«¾ð°¡¸¦ ÀÔ·ÂÇϰųª ½¬°í ÀÖÀ½"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2298
+#: src/gtkconv.c:2690
 msgid "_Send As"
 msgstr "º¸³»±â(_S)"
 
-#: src/gtkconv.c:2753
-msgid "Gaim - Save Conversation"
+#: src/gtkconv.c:3110
+#, fuzzy
+msgid "Save Conversation"
 msgstr "°ÔÀÓ - ´ëÈ­ ÀúÀå"
 
 #. Conversation menu
-#: src/gtkconv.c:2770
+#: src/gtkconv.c:3127
 msgid "/_Conversation"
 msgstr "/´ëÈ­(_C)"
 
-#: src/gtkconv.c:2772
+#: src/gtkconv.c:3129
+#, fuzzy
+msgid "/Conversation/New Instant _Message..."
+msgstr "/´ëÈ­(C)/±×¸² ³Ö±â(_I)..."
+
+#: src/gtkconv.c:3134
+#, fuzzy
+msgid "/Conversation/_Find..."
+msgstr "/´ëÈ­(C)/´õÇϱâ(_A)..."
+
+#: src/gtkconv.c:3136
+#, fuzzy
+msgid "/Conversation/View _Log"
+msgstr "/´ëÈ­(C)/Áö³­ ´ëÈ­ º¸±â(_L)..."
+
+#: src/gtkconv.c:3137
 msgid "/Conversation/_Save As..."
 msgstr "/´ëÈ­(C)/´Ù¸¥ À̸§À¸·Î ÀúÀå(_S)..."
 
-#: src/gtkconv.c:2774
-msgid "/Conversation/View _Log..."
-msgstr "/´ëÈ­(C)/Áö³­ ´ëÈ­ º¸±â(_L)..."
-
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:3142
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/´ëÈ­(C)/Ä£±¸¾Ë¸² ´õÇϱâ(_P)..."
 
-#: src/gtkconv.c:2780
-msgid "/Conversation/A_lias..."
-msgstr "/´ëÈ­(C)/º°Äª(_L)..."
-
-#: src/gtkconv.c:2782
-msgid "/Conversation/_Get Info..."
+#: src/gtkconv.c:3144
+#, fuzzy
+msgid "/Conversation/_Get Info"
 msgstr "/´ëÈ­(C)/Á¤º¸ º¸±â(_G)..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:3146
+msgid "/Conversation/_Warn..."
+msgstr "/´ëÈ­(C)/°æ°í(_W)..."
+
+#: src/gtkconv.c:3148
 msgid "/Conversation/In_vite..."
 msgstr "/´ëÈ­(C)/ÃÊ´ë(_V)..."
 
-#: src/gtkconv.c:2789
-msgid "/Conversation/Insert _URL..."
-msgstr "/´ëÈ­(C)/_URL ³Ö±â..."
-
-#: src/gtkconv.c:2791
-msgid "/Conversation/Insert _Image..."
-msgstr "/´ëÈ­(C)/±×¸² ³Ö±â(_I)..."
-
-#: src/gtkconv.c:2796
-msgid "/Conversation/_Warn..."
-msgstr "/´ëÈ­(C)/°æ°í(_W)..."
-
-#: src/gtkconv.c:2798
+#: src/gtkconv.c:3153
+msgid "/Conversation/A_lias..."
+msgstr "/´ëÈ­(C)/º°Äª(_L)..."
+
+#: src/gtkconv.c:3155
 msgid "/Conversation/_Block..."
 msgstr "/´ëÈ­(C)/Â÷´Ü(_B)"
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:3157
 msgid "/Conversation/_Add..."
 msgstr "/´ëÈ­(C)/´õÇϱâ(_A)..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:3159
 msgid "/Conversation/_Remove..."
 msgstr "/´ëÈ­(C)/Áö¿ì±â(_R)..."
 
-#: src/gtkconv.c:2807
+#: src/gtkconv.c:3164
+#, fuzzy
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/´ëÈ­(C)/URL ³Ö±â..."
+
+#: src/gtkconv.c:3166
+#, fuzzy
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/´ëÈ­(C)/±×¸² ³Ö±â(I)..."
+
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Close"
 msgstr "/´ëÈ­(C)/´Ý±â(_C)"
 
 #. Options
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:3175
 msgid "/_Options"
 msgstr "/¿É¼Ç(_O)"
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:3176
 msgid "/Options/Enable _Logging"
 msgstr "/¿É¼Ç(O)/±â·ÏÇϱâ(_L)"
 
-#: src/gtkconv.c:2813
+#: src/gtkconv.c:3177
 msgid "/Options/Enable _Sounds"
 msgstr "/¿É¼Ç(O)/¼Ò¸® µè±â(_S)"
 
-#: src/gtkconv.c:2853
-msgid "/Conversation/View Log..."
+#: src/gtkconv.c:3178
+msgid "/Options/Show Formatting _Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3220
+#, fuzzy
+msgid "/Conversation/View Log"
 msgstr "/´ëÈ­(C)/Áö³­ ´ëÈ­ º¸±â..."
 
-#: src/gtkconv.c:2858
+#: src/gtkconv.c:3225
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/´ëÈ­(C)/Ä£±¸ ¾Ë¸² ´õÇϱâ..."
 
-#: src/gtkconv.c:2862
-msgid "/Conversation/Alias..."
-msgstr "/´ëÈ­(C)/º°Äª..."
-
-#: src/gtkconv.c:2866
-msgid "/Conversation/Get Info..."
+#: src/gtkconv.c:3231
+#, fuzzy
+msgid "/Conversation/Get Info"
 msgstr "/´ëÈ­(C)/Á¤º¸ º¸±â..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:3235
+msgid "/Conversation/Warn..."
+msgstr "/´ëÈ­(C)/°æ°í..."
+
+#: src/gtkconv.c:3239
 msgid "/Conversation/Invite..."
 msgstr "/´ëÈ­(C)/ÃÊ´ë..."
 
-#: src/gtkconv.c:2876
-msgid "/Conversation/Insert URL..."
-msgstr "/´ëÈ­(C)/URL ³Ö±â..."
-
-#: src/gtkconv.c:2880
-msgid "/Conversation/Insert Image..."
-msgstr "/´ëÈ­(C)/±×¸² ³Ö±â(I)..."
-
-#: src/gtkconv.c:2886
-msgid "/Conversation/Warn..."
-msgstr "/´ëÈ­(C)/°æ°í..."
-
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:3245
+msgid "/Conversation/Alias..."
+msgstr "/´ëÈ­(C)/º°Äª..."
+
+#: src/gtkconv.c:3249
 msgid "/Conversation/Block..."
 msgstr "/´ëÈ­(C)/Â÷´Ü..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:3253
 msgid "/Conversation/Add..."
 msgstr "/´ëÈ­(C)/´õÇϱâ..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:3257
 msgid "/Conversation/Remove..."
 msgstr "/´ëÈ­(C)/Áö¿ì±â..."
 
-#: src/gtkconv.c:2904
+#: src/gtkconv.c:3263
+#, fuzzy
+msgid "/Conversation/Insert Link..."
+msgstr "/´ëÈ­(C)/URL ³Ö±â..."
+
+#: src/gtkconv.c:3267
+msgid "/Conversation/Insert Image..."
+msgstr "/´ëÈ­(C)/±×¸² ³Ö±â(I)..."
+
+#: src/gtkconv.c:3273
 msgid "/Options/Enable Logging"
 msgstr "/¿É¼Ç(O)/±â·ÏÇϱâ(L)"
 
-#: src/gtkconv.c:2907
+#: src/gtkconv.c:3276
 msgid "/Options/Enable Sounds"
 msgstr "/¿É¼Ç(O)/¼Ò¸® µè±â(S)"
 
+#: src/gtkconv.c:3279
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2931 src/gtkconv.c:2933 src/gtkconv.c:3031 src/gtkconv.c:3033
-#: src/gtkconv.c:5882
+#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
 msgid "Send"
 msgstr "º¸³»±â"
 
-#: src/gtkconv.c:2954 src/gtkconv.c:4123
-msgid "Add the user to your buddy list"
-msgstr "Ä£±¸ ¸ñ·Ï¿¡ »ç¿ëÀÚ ´õÇϱâ"
-
-#: src/gtkconv.c:2960 src/gtkconv.c:4108
-msgid "Remove the user from your buddy list"
-msgstr "Ä£±¸ ¸ñ·Ï¿¡¼­ »ç¿ëÀÚ »©±â"
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:3318
 msgid "Warn"
 msgstr "°æ°í"
 
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:3321
 msgid "Warn the user"
 msgstr "»ç¿ëÀÚ °æ°í"
 
-#: src/gtkconv.c:2978 src/gtkconv.c:3413
-msgid "Get the user's information"
-msgstr "»ç¿ëÀÚÀÇ Á¤º¸ °¡Á®¿À±â"
-
 #. Block button
-#: src/gtkconv.c:2981 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "Â÷´Ü"
 
-#: src/gtkconv.c:2985
+#: src/gtkconv.c:3328
 msgid "Block the user"
 msgstr "»ç¿ëÀÚ Â÷´Ü"
 
+#: src/gtkconv.c:3335
+msgid "Add the user to your buddy list"
+msgstr "Ä£±¸ ¸ñ·Ï¿¡ »ç¿ëÀÚ ´õÇϱâ"
+
+#: src/gtkconv.c:3342
+msgid "Remove the user from your buddy list"
+msgstr "Ä£±¸ ¸ñ·Ï¿¡¼­ »ç¿ëÀÚ »©±â"
+
+#: src/gtkconv.c:3349 src/gtkconv.c:3671
+msgid "Get the user's information"
+msgstr "»ç¿ëÀÚÀÇ Á¤º¸ °¡Á®¿À±â"
+
 #. Invite
-#: src/gtkconv.c:3043 src/gtkconv.c:5885
+#: src/gtkconv.c:3416
 msgid "Invite"
 msgstr "ÃÊ´ë"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3419
 msgid "Invite a user"
 msgstr "»ç¿ëÀÚ ÃÊ´ë"
 
-#: src/gtkconv.c:3085
-msgid "Bold"
-msgstr "ÁøÇÏ°Ô"
-
-#: src/gtkconv.c:3096
-msgid "Italic"
-msgstr "±â¿ïÀÓ"
-
-#: src/gtkconv.c:3107
-msgid "Underline"
-msgstr "¹ØÁÙ"
-
-#: src/gtkconv.c:3123
-msgid "Larger font size"
-msgstr "±ÛÀÚ Å©±â¸¦ Å©°Ô"
-
-#: src/gtkconv.c:3135
-msgid "Normal font size"
-msgstr "±ÛÀÚ Å©±â¸¦ º¸ÅëÀ¸·Î"
-
-#: src/gtkconv.c:3147
-msgid "Smaller font size"
-msgstr "±ÛÀÚ Å©±â¸¦ ÀÛ°Ô"
-
-#: src/gtkconv.c:3164
-msgid "Font Face"
-msgstr "±Û²Ã"
-
-#: src/gtkconv.c:3176
-msgid "Foreground font color"
-msgstr "±ÛÀÚ»ö"
-
-#: src/gtkconv.c:3188
-msgid "Background color"
-msgstr "±ÛÀÚ ¹ÙÅÁ»ö"
-
-#: src/gtkconv.c:3203
-msgid "Insert image"
-msgstr "±×¸² ³Ö±â"
-
-#: src/gtkconv.c:3214
-msgid "Insert link"
-msgstr "¸µÅ© ³Ö±â"
-
-#: src/gtkconv.c:3225
-msgid "Insert smiley"
-msgstr "½º¸¶Àϸ® ³Ö±â"
-
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3426
+#, fuzzy
+msgid "Add the chat to your buddy list"
+msgstr "Ä£±¸ ¸ñ·Ï¿¡ »ç¿ëÀÚ ´õÇϱâ"
+
+#: src/gtkconv.c:3433
+#, fuzzy
+msgid "Remove the chat from your buddy list"
+msgstr "Ä£±¸ ¸ñ·Ï¿¡¼­ »ç¿ëÀÚ »©±â"
+
+#: src/gtkconv.c:3533
 msgid "Topic:"
 msgstr "ÁÖÁ¦:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3593
 msgid "0 people in room"
 msgstr "´ëÈ­½Ç¿¡ ¾Æ¹«µµ ¾øÀ½"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3648
 msgid "IM the user"
 msgstr "¸Þ½ÅÀú »ç¿ëÀÚ"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3660
 msgid "Ignore the user"
 msgstr "»ç¿ëÀÚ ¹«½Ã"
 
-#: 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:3903 src/server.c:1373
-#, c-format
-msgid "---- New Conversation @ %s ----\n"
-msgstr "---- %s´Ô°úÀÇ »õ ´ëÈ­ ----\n"
-
-#: src/gtkconv.c:3935
+#: src/gtkconv.c:4202
 msgid "Close conversation"
 msgstr "´ëÈ­ ´Ý±â"
 
-#: src/gtkconv.c:4601 src/gtkconv.c:4633 src/gtkconv.c:4754 src/gtkconv.c:4821
+#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "¹æ¿¡ %d¸íÀÌ ÀÖÀ½"
 
-#: src/gtkconv.c:5158
-msgid "Disable Animation"
-msgstr "¾Ö´Ï¸ÞÀÌ¼Ç ²û"
-
-#: src/gtkconv.c:5167
-msgid "Enable Animation"
-msgstr "¾Ö´Ï¸ÞÀÌ¼Ç »ç¿ë"
-
-#: src/gtkconv.c:5174
-msgid "Hide Icon"
-msgstr "¾ÆÀÌÄÜ ¼û±è"
-
-#: src/gtkconv.c:5180
-msgid "Save Icon As..."
-msgstr "»õ À̸§À¸·Î ¾ÆÀÌÄÜ ÀúÀå..."
-
-#: src/gtkconv.c:5655 src/gtkconv.c:5658
+#: src/gtkconv.c:5484 src/gtkconv.c:5487
 msgid "<main>/Conversation/Close"
 msgstr "<¸ÞÀÎ>/´ëÈ­(C)/´Ý±â(C)"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "µð¹ö±× â"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "Àá½Ã ¸ØÃã"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "½Ã°£ Ç¥½Ã"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/gtkft.c:200
+#: src/gtkft.c:156 src/gtkft.c:957
+msgid "Finished"
+msgstr ""
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>¹ÞÀ½:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>º¸³¿:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:386
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+#: src/gtkft.c:391
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#: src/gtkft.c:482
 msgid "Progress"
 msgstr "ÁøÇà"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "ÆÄÀϸí"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "Å©±â"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr "³²Àº ¾ç"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "ÆÄÀϸí:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "»óÅÂ:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "¼Óµµ:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr "Áö³­ ½Ã°£:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr "³²Àº ½Ã°£:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr "âÀ» ¿­¾îµÒ(_K)"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr "Àü¼ÛÀÌ ³¡³ª¸é ±ú²ýÀÌ(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
+#: src/gtkft.c:653
+#, fuzzy
+msgid "Show transfer details"
 msgstr "´Ù¿î·Îµå ³»¿ë º¸À̱â"
 
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:654
+#, fuzzy
+msgid "Hide transfer details"
 msgstr "´Ù¿î·Îµå ³»¿ë °¨Ãß±â"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "Àá½Ã ¸ØÃã(_P)"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "°è¼Ó(_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:908
+#, fuzzy
+msgid "Canceled"
+msgstr "Ãë¼Ò"
+
+#: src/gtkft.c:910
+#, fuzzy
+msgid "Failed"
+msgstr "½ÇÆÐ."
+
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr "ÆÄÀÏÀÌ ¾ø½À´Ï´Ù."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 ¹ÙÀÌÆ®ÀÇ ÆÄÀÏÀº º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr "°°Àº ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
+#: src/gtkft.c:1131
+#, fuzzy
+msgid "Open..."
 msgstr "°ÔÀÓ - ¿­±â..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2004
-msgid "Gaim - Save As..."
-msgstr "°ÔÀÓ - »õ À̸§À¸·Î ÀúÀå..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1133
+#, fuzzy
+msgid "Save As..."
+msgstr "»õ À̸§À¸·Î ¾ÆÀÌÄÜ ÀúÀå..."
+
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s´ÔÀÌ %s ÆÄÀÏÀ» º¸³»·Á°í ÇÔ(%s)"
 
-#: src/gtkimhtml.c:529
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#: src/gtkimhtml.c:1139
+#, fuzzy
+msgid "_Copy E-Mail Address"
+msgstr "¸ÞÀÏ ÁÖ¼Ò"
+
+#: src/gtkimhtml.c:1151
 msgid "_Copy Link Location"
 msgstr "´ë»ó °æ·Î º¹»ç(_C)"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:1161
 msgid "_Open Link in Browser"
 msgstr "ºê¶ó¿ìÀú¿¡¼­ ¿­±â(_O)"
 
-#: src/gtkimhtml.c:1632
+#: src/gtkimhtml.c:2643
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2721,36 +3085,131 @@
 "ÆÄÀÏ È®ÀåÀÚ·Î ±×¸² ŸÀÔÀ» ¿¹»óÇÏ´Â ±â´ÉÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù.  ±âº»Àº PNGÀÔ´Ï"
 "´Ù."
 
-#: src/gtkimhtml.c:1640
+#: src/gtkimhtml.c:2651
 #, c-format
 msgid "Error saving image: %s"
 msgstr "À̹ÌÁö ÀúÀå ¿À·ù: %s"
 
-#: src/gtkimhtml.c:1649
+#: src/gtkimhtml.c:2660
 msgid "Save Image"
 msgstr "À̹ÌÁö ÀúÀå"
 
-#: src/gtkimhtml.c:1671
+#: src/gtkimhtml.c:2683
 msgid "_Save Image..."
 msgstr "À̹ÌÁö ÀúÀå(_S)..."
 
-#: src/gtknotify.c:203
+#: src/gtkimhtmltoolbar.c:383
+msgid "_URL"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:387
+#, fuzzy
+msgid "_Description"
+msgstr "¼³¸í"
+
+#: src/gtkimhtmltoolbar.c:392
+msgid "Insert Link"
+msgstr "¸µÅ© ³Ö±â"
+
+#: src/gtkimhtmltoolbar.c:394
+#, fuzzy
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr "URL°ú Ãß°¡ÇÏ·Á´Â ¸µÅ©¿¡ ´ëÇÑ ¼³¸íÀ» ³ÖÀ¸¼¼¿ä. ¼³¸íÀº ¼±ÅûçÇ×ÀÔ´Ï´Ù.\n"
+
+#: src/gtkimhtmltoolbar.c:398
+#, fuzzy
+msgid "_Insert"
+msgstr "»ðÀÔ"
+
+#: src/gtkimhtmltoolbar.c:455
+#, fuzzy, c-format
+msgid "Failed to store image: %s\n"
+msgstr "%s ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+
+#: src/gtkimhtmltoolbar.c:481
+#, fuzzy
+msgid "Insert Image"
+msgstr "±×¸² ³Ö±â"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:625
+msgid "Smile!"
+msgstr "¿ô¾î¿ä!"
+
+#: src/gtkimhtmltoolbar.c:825
+msgid "Bold"
+msgstr "ÁøÇÏ°Ô"
+
+#: src/gtkimhtmltoolbar.c:836
+msgid "Italic"
+msgstr "±â¿ïÀÓ"
+
+#: src/gtkimhtmltoolbar.c:847
+msgid "Underline"
+msgstr "¹ØÁÙ"
+
+#: src/gtkimhtmltoolbar.c:863
+msgid "Larger font size"
+msgstr "±ÛÀÚ Å©±â¸¦ Å©°Ô"
+
+#: src/gtkimhtmltoolbar.c:875
+msgid "Smaller font size"
+msgstr "±ÛÀÚ Å©±â¸¦ ÀÛ°Ô"
+
+#: src/gtkimhtmltoolbar.c:892
+msgid "Font Face"
+msgstr "±Û²Ã"
+
+#: src/gtkimhtmltoolbar.c:904
+msgid "Foreground font color"
+msgstr "±ÛÀÚ»ö"
+
+#: src/gtkimhtmltoolbar.c:916
+msgid "Background color"
+msgstr "±ÛÀÚ ¹ÙÅÁ»ö"
+
+#: src/gtkimhtmltoolbar.c:931
+msgid "Insert link"
+msgstr "¸µÅ© ³Ö±â"
+
+#: src/gtkimhtmltoolbar.c:941
+msgid "Insert image"
+msgstr "±×¸² ³Ö±â"
+
+#: src/gtkimhtmltoolbar.c:952
+msgid "Insert smiley"
+msgstr "½º¸¶Àϸ® ³Ö±â"
+
+#: src/gtklog.c:282
+#, fuzzy
+msgid "Conversations with"
+msgstr "%s´Ô°úÀÇ ´ëÈ­"
+
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr "½Ã½ºÅÛ ·Î±×"
+
+#. Descriptive label
+#: src/gtknotify.c:217
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%sÀÌ(°¡) %d°³ÀÇ »õ ¸Þ½ÃÁö¸¦ ¹Þ¾Ò½À´Ï´Ù."
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2761,7 +3220,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2772,156 +3231,202 @@
 "\n"
 "%s"
 
-#: src/gtkpounce.c:140
+#: src/gtknotify.c:441
+#, fuzzy, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "»õ·Î¿î Æ÷¸ËÀÌ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "USRÀ» º¸³¾ ¼ö ¾øÀ½"
+
+#: src/gtknotify.c:455 src/gtknotify.c:470
+#, fuzzy, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "%s ¿À·ù: %s"
+
+#: src/gtknotify.c:582
+#, fuzzy
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"¼öµ¿ ºê¶ó¿ìÀú ¸í·ÉÀÌ ¼±ÅõǾúÁö¸¸ ¸í·ÉÀÌ ºñ¾îÀ־ ½ÇÇàÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "ÆÄÀÏ ¼±ÅÃÇϱâ"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "¾Ë¸®·Á´Â Ä£±¸¸¦ ³ÖÀ¸¼¼¿ä."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:383 src/gtkpounce.c:788
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "»õ·Î¿î Ä£±¸¾Ë¸²"
 
-#: src/gtkpounce.c:383
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "Ä£±¸¾Ë¸² °íÄ¡±â"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:401
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "´©±¸¸¦"
 
-#: src/gtkpounce.c:427
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "Ä£±¸ À̸§(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:449
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "¾ðÁ¦"
 
-#: src/gtkpounce.c:457 src/main.c:331
-msgid "Sign on"
+#: src/gtkpounce.c:412
+#, fuzzy
+msgid "_Sign on"
 msgstr "¿¬°á"
 
-#: src/gtkpounce.c:459
-msgid "Sign off"
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
 msgstr "¿¬°á ²÷À½"
 
-#: src/gtkpounce.c:463
-msgid "Return from away"
+#: src/gtkpounce.c:416
+#, fuzzy
+msgid "A_way"
+msgstr "ÀÚ¸®ºñ¿ò"
+
+#: src/gtkpounce.c:418
+#, fuzzy
+msgid "Re_turn from away"
 msgstr "ÀÚ¸®ºñ¿ò¿¡¼­ µ¹¾Æ¿È"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1535 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1069
-msgid "Idle"
+#: src/gtkpounce.c:420
+#, fuzzy
+msgid "_Idle"
 msgstr "»ç¿ë¾ÈÇÔ"
 
-#: src/gtkpounce.c:467
-msgid "Return from idle"
+#: src/gtkpounce.c:422
+#, fuzzy
+msgid "Retur_n from idle"
 msgstr "»ç¿ë¾ÈÇÔ¿¡¼­ µ¹¾Æ¿È"
 
-#: src/gtkpounce.c:469
-msgid "Buddy starts typing"
+#: src/gtkpounce.c:424
+#, fuzzy
+msgid "Buddy starts _typing"
 msgstr "Ä£±¸°¡ ÀÔ·ÂÀ» ½ÃÀÛ"
 
-#: src/gtkpounce.c:471
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:426
+#, fuzzy
+msgid "Buddy stops t_yping"
 msgstr "Ä£±¸°¡ ÀÔ·ÂÀ» ¸ØÃã"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:500
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "¾Ë¸± Çൿ"
 
-#: src/gtkpounce.c:507
-msgid "Open an IM window"
+#: src/gtkpounce.c:462
+#, fuzzy
+msgid "Op_en an IM window"
 msgstr "¸Þ½ÅÀú â ¿­±â"
 
-#: src/gtkpounce.c:508
-msgid "Popup notification"
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
 msgstr "Æ˾÷ ¾Ë¸²"
 
-#: src/gtkpounce.c:509
-msgid "Send a message"
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/gtkpounce.c:510
-msgid "Execute a command"
+#: src/gtkpounce.c:465
+#, fuzzy
+msgid "E_xecute a command"
 msgstr "¸í·É ½ÇÇà"
 
-#: src/gtkpounce.c:511
-msgid "Play a sound"
+#: src/gtkpounce.c:466
+#, fuzzy
+msgid "P_lay a sound"
 msgstr "¼Ò¸®³»±â"
 
-#: src/gtkpounce.c:515 src/gtkpounce.c:517
-msgid "Browse"
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
 msgstr "Ž»ö"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2121
-msgid "Test"
-msgstr "Å×½ºÆ®"
-
-#: src/gtkpounce.c:601
-msgid "_Save this pounce after activation"
+#: src/gtkpounce.c:472
+#, fuzzy
+msgid "Bro_wse..."
+msgstr "Ž»ö"
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr ""
+
+#: src/gtkpounce.c:556
+#, fuzzy
+msgid "Sav_e this pounce after activation"
 msgstr "È°¼º ÈÄ¿¡ ÀÌ ¾Ë¸²À» ÀúÀå(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "Ä£±¸¾Ë¸² Áö¿ì±â"
 
-#: src/gtkpounce.c:836
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s´ÔÀÌ ÀÔ·ÂÀ» ½ÃÀÛÇÔ"
 
-#: src/gtkpounce.c:837
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s´ÔÀÌ ¿¬°áµÊ"
 
-#: src/gtkpounce.c:838
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s´ÔÀÌ »ç¿ë¾ÈÇÔ »óÅ¿¡¼­ µ¹¾Æ¿È"
 
-#: src/gtkpounce.c:839
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s´ÔÀÌ ÀÚ¸®ºñ¿ò »óÅ¿¡¼­ µ¹¾Æ¿È"
 
-#: src/gtkpounce.c:840
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s´ÔÀÌ ÀÔ·ÂÀ» ¸ØÃã"
 
-#: src/gtkpounce.c:841
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s´ÔÀÇ ¿¬°áÀÌ ²÷±è"
 
-#: src/gtkpounce.c:842
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s´ÔÀÌ »ç¿ë¾ÈÇÔ »óÅ°¡ µÊ"
 
-#: src/gtkpounce.c:844
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "¾Ë ¼ö ¾ø´Â ¾Ë¸² À̺¥Æ®ÀÔ´Ï´Ù. ÀÌ°ÍÀ» º¸°íÇØÁÖ¼¼¿ä!"
 
-#: src/gtkprefs.c:381
+#: src/gtkprefs.c:399
 msgid "Interface Options"
 msgstr "ÀÎÅÍÆäÀ̽º ¿É¼Ç"
 
-#: src/gtkprefs.c:383
+#: src/gtkprefs.c:401
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "º°ÄªÀÌ ¼³Á¤µÇ¾î ÀÖÁö ¾ÊÀ¸¸é ´ëÈ­¸í º¸ÀÓ(_I)"
 
-#: src/gtkprefs.c:564
+#: src/gtkprefs.c:595
 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."
@@ -2929,360 +3434,433 @@
 "¾Æ·¡ ¸ñ·Ï¿¡¼­ »ç¿ëÇÒ ½º¸¶Àϸ® Å׸¶¸¦ ¼±ÅÃÇϽʽÿÀ. »õ·Î¿î Å׸¶¸¦ ¸ñ·Ï¿¡ ²ø¾î"
 "´Ù ³õ¾Æ¼­ ¼³Ä¡ÇÒ ¼öµµ ÀÖ½À´Ï´Ù."
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:630
 msgid "Icon"
 msgstr "¾ÆÀÌÄÜ"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+msgid "Description"
+msgstr "¼³¸í"
+
+#: src/gtkprefs.c:704
 msgid "Style"
 msgstr "½ºÅ¸ÀÏ"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:705
 msgid "_Bold"
 msgstr "µÎ²®°Ô(_B)"
 
-#: src/gtkprefs.c:674
-msgid "_Italics"
+#: src/gtkprefs.c:707
+#, fuzzy
+msgid "_Italic"
 msgstr "±â¿ïÀÓ(_I)"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:709
 msgid "_Underline"
 msgstr "¹ØÁÙ(_U)"
 
-#: src/gtkprefs.c:678
+#. who in their right mind would use this as a default anyway?
+#. * and plus, it wouldn't work as the code currently existed,
+#. * and then i went and applied simguy's patch to remove the
+#. * non-functional code.
+#. *
+#. * remove this after string freeze ends
+#.
+#: src/gtkprefs.c:719
 msgid "_Strikethrough"
 msgstr "°¡¿îµ¥ ÁÙ(_S)"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:722
 msgid "Face"
 msgstr "±Û²Ã"
 
-#: src/gtkprefs.c:684
+#: src/gtkprefs.c:725
 msgid "Use custo_m face"
 msgstr "Á¤ÇØÁø ±Û²Ã »ç¿ë(_M)"
 
-#: src/gtkprefs.c:701
+#: src/gtkprefs.c:742
 msgid "Use custom si_ze"
 msgstr "Á¤ÇØÁø Å©±â »ç¿ë(_Z)"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:754
 msgid "Color"
 msgstr "»ö±ò"
 
-#: src/gtkprefs.c:718
+#: src/gtkprefs.c:758
 msgid "_Text color"
 msgstr "±ÛÀÚ »ö±ò(_T)"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:777
 msgid "Bac_kground color"
 msgstr "¹ÙÅÁ »ö±ò(_K)"
 
-#: src/gtkprefs.c:765 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
 msgid "Display"
 msgstr "º¸±â"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:806
 msgid "Show graphical _smileys"
 msgstr "À̸ðƼÄÜÀ» ±×¸²À¸·Î(_S)"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:808
 msgid "Show _timestamp on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ º¸¿©ÁÖ±â(_T)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:810
 msgid "Show _URLs as links"
 msgstr "_URLÀ» ¸µÅ©·Î"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:814
 msgid "_Highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ¸¦ °­Á¶(_H)"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:818
 msgid "Ignore c_olors"
 msgstr "»ö±ò ¹«½Ã(_O)"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:820
 msgid "Ignore font _faces"
 msgstr "±Û²Ã ¹«½Ã(_F)"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:822
 msgid "Ignore font si_zes"
 msgstr "±ÛÀÚ Å©±â ¹«½Ã(_Z)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:835
 msgid "Send Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:836
 msgid "Enter _sends message"
 msgstr "¿£ÅÍÅ°·Î ¸Þ½ÃÁö º¸³¿(_S)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:838
 msgid "C_ontrol-Enter sends message"
 msgstr "ÄÁÆ®·Ñ-¿£ÅÍ·Î ¸Þ½ÃÁö º¸³¿(_O)"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "⠴ݱâ"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "_Esc Å°·Î â ´ÝÀ½"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:845
 msgid "Insertions"
 msgstr "³Ö±â"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:846
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "ÄÁÆ®·Ñ-{B/I/U}Å°·Î _HTML ÅÂ±× ³Ö±â"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:848
 msgid "Control-(number) _inserts smileys"
 msgstr "ÄÁÆ®·Ñ-(¼ýÀÚ)Å°·Î À̸ðƼÄÜ ³Ö±â(_I)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:864
 msgid "Buddy List Sorting"
 msgstr "Ä£±¸ ¸ñ·Ï Á¤·Ä"
 
-#: src/gtkprefs.c:834
-msgid "Sorting:"
+#: src/gtkprefs.c:873
+#, fuzzy
+msgid "_Sorting:"
 msgstr "Á¤·Ä:"
 
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:878
 msgid "Buddy List Toolbar"
 msgstr "Ä£±¸ ¸ñ·Ï µµ±¸¸ðÀ½"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "Show _buttons as:"
 msgstr "´ÙÀ½Ã³·³ ´ÜÃ߸¦ º¸¿©ÁÖ±â(_B): "
 
-#: src/gtkprefs.c:842 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "Pictures"
 msgstr "±×¸²"
 
-#: src/gtkprefs.c:843 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
 msgid "Text"
 msgstr "±ÛÀÚ"
 
-#: src/gtkprefs.c:844 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 msgid "Pictures and text"
 msgstr "±×¸²°ú ±ÛÀÚ"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
 msgid "_Raise window on events"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ⠿ø²(_R)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:891
 msgid "Group Display"
 msgstr "±×·ì º¸±â"
 
-#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:892
 msgid "Show _numbers in groups"
 msgstr "±×·ì¿¡ »ç¶÷ ¼ýÀÚ º¸À̱â(_N)"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:895
 msgid "Buddy Display"
 msgstr "Ä£±¸ º¸¿©ÁÖ±â"
 
-#: src/gtkprefs.c:858 src/gtkprefs.c:993
+#: src/gtkprefs.c:896 src/gtkprefs.c:1032
 msgid "Show buddy _icons"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ º¸¿©ÁÖ±â(_I)"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:898
 msgid "Show _warning levels"
 msgstr "°æ°í ¼öÁØ º¸¿©ÁÖ±â(_W)"
 
-#: src/gtkprefs.c:863
+#: src/gtkprefs.c:900
 msgid "Show idle _times"
 msgstr "»ç¿ë ¾ÈÇÑ ½Ã°£ º¸¿©ÁÖ±â(_T)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:902
 msgid "Dim i_dle buddies"
 msgstr "»ç¿ë¾ÈÇϴ ģ±¸¸¦ ȸ»öÀ¸·Î(_D)"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:904
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:929
 msgid "_Placement:"
 msgstr "À§Ä¡(_P):"
 
-#: src/gtkprefs.c:910
-msgid "Send _URLs as Links"
+#: src/gtkprefs.c:936
+#, fuzzy
+msgid "Send _URLs as links"
 msgstr "_URLÀ» ¸µÅ©·Î º¸³¿"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:939
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:942
+msgid "Show a_liases in tabs/titles"
+msgstr "ÅÇ/Á¦¸ñ¿¡ º°¸í º¸ÀÓ(_L)"
+
+#: src/gtkprefs.c:945
 msgid "Tab Options"
 msgstr "ÅÇ ¿É¼Ç"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:947
 msgid "_Tab Placement:"
 msgstr "ÅÇ À§Ä¡(_T):"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:949
 msgid "Top"
 msgstr "ˤ"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:950
 msgid "Bottom"
 msgstr "¾Æ·¡"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:951
 msgid "Left"
 msgstr "¿ÞÂÊ"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:952
 msgid "Right"
 msgstr "¿À¸¥ÂÊ"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:958
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "¸Þ½ÅÀú¿Í äÆÃÀ» ÅÇ Ã¢¿¡¼­ º¸¿©ÁÜ(_T)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:961
+#, fuzzy
+msgid "Show IMs and chats in _same tabbed window"
+msgstr "¸Þ½ÅÀú¿Í äÆÃÀ» ÅÇ Ã¢¿¡¼­ º¸¿©ÁÜ(_T)"
+
+#: src/gtkprefs.c:971
 msgid "Show _close button on tabs"
 msgstr "ÅÇ¿¡¼­ ´Ý±â ´ÜÃ߸¦ º¸¿©ÁÖ±â(_C): "
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:982
 msgid "Show status _icons on tabs"
 msgstr "ÅÇ¿¡¼­ »óÅ ¾ÆÀÌÄÜ º¸¿©ÁÖ±â(_I)"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
 msgid "Window"
 msgstr "â"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
 msgid "New window _width:"
 msgstr "»õ ´ëȭâÀÇ Æø(_W):"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
 msgid "New window _height:"
 msgstr "»õ ´ëȭâÀÇ ³ôÀÌ(_H):"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
 msgid "_Entry field height:"
 msgstr "´ëÈ­ ÀÔ·Â »óÀÚÀÇ ³ôÀÌ(_E):"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1027
 msgid "Hide window on _send"
 msgstr "¸Þ½ÃÁö º¸³½ ÈÄ Ã¢ ´ÝÀ½(_S)"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1031
 msgid "Buddy Icons"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1034
 msgid "Enable buddy icon a_nimation"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ ¾Ö´Ï¸ÞÀÌ¼Ç ÄÔ(_N)"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1038
 msgid "Show _logins in window"
 msgstr "â¿¡¼­ Á¢¼Ó º¸¿©ÁÖ±â(_L)"
 
-#: src/gtkprefs.c:1001
-msgid "Show a_liases in tabs/titles"
-msgstr "ÅÇ/Á¦¸ñ¿¡ º°¸í º¸ÀÓ(_L)"
-
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1041
 msgid "Typing Notification"
 msgstr "ŸÀÌÇÎ ¾Ë¸²"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1042
 msgid "Notify buddies that you are _typing to them"
 msgstr "Ä£±¸¿¡°Ô ŸÀÌÇÎÇÒ ¶§ ¾Ë¸²(_T)"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1079
 msgid "Tab Completion"
 msgstr "ÀÚµ¿¿Ï¼º"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1080
 msgid "_Tab-complete nicks"
 msgstr "ÅÇ Å°·Î º°¸í ÀÚµ¿¿Ï¼º(_T)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1082
 msgid "_Old-style tab completion"
 msgstr "±¸½Ä ÅÇ ÀÚµ¿¿Ï¼º(_O)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1086
 msgid "_Show people joining in window"
 msgstr "»ç¿ëÀÚ°¡ Âü¿©ÇÏ´Â °ÍÀ» â¿¡¼­ º¸¿©ÁÜ(_S)"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1088
 msgid "_Show people leaving in window"
 msgstr "»ç¿ëÀÚ°¡ ¶°³ª´Â °ÍÀ» â¿¡¼­ º¸¿©ÁÜ(_S)"
 
-#: src/gtkprefs.c:1056
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1090
+#, fuzzy
+msgid "Co_lorize screen names"
 msgstr "»ö±ò ÀÖ´Â ¾ÆÀ̵ð(_L)"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
+#, fuzzy
+msgid "IP Address"
+msgstr "°Å¸® ÁÖ¼Ò"
+
+#: src/gtkprefs.c:1113
+#, fuzzy
+msgid "_Autodetect IP Address"
+msgstr "°Å¸® ÁÖ¼Ò"
+
+#: src/gtkprefs.c:1122
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1146
+#, fuzzy
+msgid "Ports"
+msgstr "Æ÷Æ®"
+
+#: src/gtkprefs.c:1149
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1152
+#, fuzzy
+msgid "_Start Port:"
+msgstr "Æ÷Æ®(_P):"
+
+#: src/gtkprefs.c:1159
+#, fuzzy
+msgid "_End Port:"
+msgstr "Æ÷Æ®(_P):"
+
+#: src/gtkprefs.c:1207
 msgid "Proxy Type"
 msgstr "ÇÁ·Ï½Ã Á¾·ù"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1210
 msgid "No proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë ¾ÈÇÔ"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1217
 msgid "Proxy Server"
 msgstr "ÇÁ·Ï½Ã ¼­¹ö"
 
-#: src/gtkprefs.c:1131
-msgid "_Host"
-msgstr "È£½ºÆ®(_H)"
-
-#. 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:1166
-msgid "_User"
+#: src/gtkprefs.c:1275
+#, fuzzy
+msgid "_User:"
 msgstr "»ç¿ëÀÚ(_U)"
 
-#: src/gtkprefs.c:1183
-msgid "Pa_ssword"
-msgstr "ºñ¹Ð¹øÈ£(_S)"
-
-#: src/gtkprefs.c:1239
-#, c-format
-msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr ""
-
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1331
 msgid "Opera"
 msgstr "¿ÀÆä¶ó"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "³Ý½ºÄÉÀÌÇÁ"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "¸ðÁú¶ó"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "ÄÁÄõ·¯"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1335
 msgid "Galeon"
 msgstr "°¥·¹¿Â"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1336
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1337
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1338
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1347
 msgid "Manual"
 msgstr "¼öµ¿"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "ºê¶ó¿ìÀú ¼±ÅÃ"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "ºê¶ó¿ìÀú(_B):"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1409
+#, fuzzy
+msgid "_Open link in:"
+msgstr "ºê¶ó¿ìÀú¿¡¼­ ¿­±â(_O)"
+
+#: src/gtkprefs.c:1411
+#, fuzzy
+msgid "Browser default"
+msgstr "ºê¶ó¿ìÀú ¼±ÅÃ"
+
+#: src/gtkprefs.c:1412
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1414
+msgid "New tab"
+msgstr ""
+
+#: src/gtkprefs.c:1428
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3291,87 +3869,85 @@
 "¼öµ¿(_M):\n"
 "(%s´Â URL)"
 
-#: src/gtkprefs.c:1348
-msgid "Browser Options"
-msgstr "ºê¶ó¿ìÀú ¿É¼Ç"
-
-#: src/gtkprefs.c:1349
-msgid "Open new _window by default"
-msgstr "»õ âÀ¸·Î ¿­±â¸¦ ±âº»À¸·Î ÇÔ(_W)"
-
-#: src/gtkprefs.c:1364
+#: src/gtkprefs.c:1465
 msgid "Message Logs"
 msgstr "¸Þ½ÃÁö ·Î±×"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1468
+msgid "Log _Format:"
+msgstr ""
+
+#: src/gtkprefs.c:1471
 msgid "_Log all instant messages"
 msgstr "¸ðµç ¸Þ½ÅÀú ´ëÈ­¸¦ ±â·Ï(_L)"
 
-#: src/gtkprefs.c:1367
+#: src/gtkprefs.c:1473
 msgid "Log all c_hats"
 msgstr "¸ðµç ´ëÈ­¸¦ ±â·Ï(_H)"
 
-#: src/gtkprefs.c:1369
-msgid "Strip _HTML from logs"
-msgstr "_HTML ű׸¦ »©°í ±â·Ï"
-
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1476
 msgid "System Logs"
 msgstr "½Ã½ºÅÛ ·Î±×"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1478
+msgid "_Enable system log"
+msgstr ""
+
+#: src/gtkprefs.c:1481
 msgid "Log when buddies _sign on/sign off"
 msgstr "Ä£±¸ÀÇ Á¢¼Ó/Á¾·á ±â·Ï(_S)"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1487
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Ä£±¸ÀÇ »ç¿ë¾ÈÇÔ/»ç¿ëÇÔ ±â·Ï(_I)"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1493
 msgid "Log when buddies go away/come _back"
 msgstr "ÀÚ½ÅÀÇ ÀÚ¸®ºñ¿ò/µ¹¾Æ¿È ±â·Ï(_B)"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1499
 msgid "Log your _own signons/idleness/awayness"
 msgstr "ÀÚ½ÅÀÇ ¿¬°á/»ç¿ë¾ÈÇÔ/ÀÚ¸®ºñ¿ò ±â·Ï(_O)"
 
-#: src/gtkprefs.c:1381
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "Ä£±¸¸¶´Ù º°µµÀÇ ·Î±×ÆÄÀÏ »ç¿ë(_N)"
-
-#: src/gtkprefs.c:1424
+#: src/gtkprefs.c:1550
 msgid "Sound Options"
 msgstr "¼Ò¸® ¿É¼Ç"
 
-#: src/gtkprefs.c:1425
-msgid "_No sounds when you log in"
+#: src/gtkprefs.c:1551
+#, fuzzy
+msgid "Sounds when you _log in"
 msgstr "Á¢¼Ó½Ã ¼Ò¸® ¾øÀ½(_N)"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1553
+#, fuzzy
+msgid "Sounds when conversation has _focus"
+msgstr "´ëȭâÀÌ È°¼ºÈ­ µÇ¸é Áö¿ò(_F)"
+
+#: src/gtkprefs.c:1555
 msgid "_Sounds while away"
 msgstr "ÀÚ¸®ºñ¿ò½Ã ¼Ò¸® ³¿(_S)"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1559
 msgid "Sound Method"
 msgstr "¼Ò¸® ¿¬ÁÖ ¹æ½Ä"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1560
 msgid "_Method:"
 msgstr "¹æ½Ä(_M):"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1562
 msgid "Console beep"
 msgstr "ºñÇÁÀ½"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1564
 msgid "Automatic"
 msgstr "ÀÚµ¿"
 
-#: src/gtkprefs.c:1443
+#: src/gtkprefs.c:1571
 msgid "Command"
 msgstr "¸í·É"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1581
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3380,67 +3956,74 @@
 "¼Ò¸® ³¾ ¸í·É¾î(_O):\n"
 "(%s´Â ÆÄÀÏ À̸§)"
 
-#: src/gtkprefs.c:1508
+#: src/gtkprefs.c:1638
 msgid "_Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é ÀÚ¸®ºñ¿ò »óÅ¿¡¼­ ³ª¿À±â(_S)"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1640
 msgid "_Queue new messages when away"
 msgstr "ÀÚ¸®ºñ¿ò Áß¿¡ ¿À´Â »õ ¸Þ½ÃÁö ½×À½(_Q)"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1643
 msgid "Auto-response"
 msgstr "ÀÚµ¿ ÀÀ´ä"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1646
 msgid "Seconds before _resending:"
 msgstr "´ÙÀ½ ½Ã°£(ÃÊ) µÚ¿¡ Àû¿ë(_R)"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1649
 msgid "_Send auto-response"
 msgstr "ÀÚµ¿ ÀÀ´ä º¸³¿(_S)"
 
-#: src/gtkprefs.c:1521
+#: src/gtkprefs.c:1651
 msgid "_Only send auto-response when idle"
 msgstr "»ç¿ë¾ÈÇÔ »óÅ¿¡¼­¸¸ ÀÚµ¿ ÀÀ´ä(_O)"
 
-#: src/gtkprefs.c:1523
-msgid "Send auto-response in active conversations"
+#: src/gtkprefs.c:1653
+#, fuzzy
+msgid "Send auto-response in _active conversations"
 msgstr "´ëÈ­ È°¼ºÈ­ »óÅ¿¡¼­ ÀÚµ¿ ÀÀ´ä º¸³¿"
 
-#: src/gtkprefs.c:1536
+#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
+#: src/protocols/yahoo/yahoo.c:2295
+msgid "Idle"
+msgstr "»ç¿ë¾ÈÇÔ"
+
+#: src/gtkprefs.c:1663
 msgid "Idle _time reporting:"
 msgstr "»ç¿ë¾ÈÇÑ ½Ã°£ º¸°íÇϱâ(_T)"
 
-#: src/gtkprefs.c:1539
+#: src/gtkprefs.c:1666
 msgid "Gaim usage"
 msgstr "°ÔÀÓ »ç¿ëÇÏÁö ¾ÊÀº ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/gtkprefs.c:1542
+#: src/gtkprefs.c:1669
 msgid "X usage"
 msgstr "X¸¦ »ç¿ëÇÏÁö ¾ÊÀº ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/gtkprefs.c:1544
+#: src/gtkprefs.c:1671
 msgid "Windows usage"
 msgstr "â »ç¿ë"
 
-#: src/gtkprefs.c:1552
+#: src/gtkprefs.c:1679
 msgid "Auto-away"
 msgstr "ÀÚµ¿À¸·Î ÀÚ¸®ºñ¿ò"
 
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1680
 msgid "Set away _when idle"
 msgstr "»ç¿ë¾ÈÇÔ »óŽà ÀÚ¸®ºñ¿ò Ç¥½Ã(_W)"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1684
 msgid "_Minutes before setting away:"
 msgstr "´ÙÀ½ ½Ã°£(ºÐ) ÈÄ¿¡ ÀÚ¸®ºñ¿ò Ç¥½Ã(_M):"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1692
 msgid "Away m_essage:"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö(_E):"
 
-#: src/gtkprefs.c:1624
+#: src/gtkprefs.c:1767
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3455,7 +4038,7 @@
 "<span weight=\"bold\">À¥ »çÀÌÆ®:</span>\t%s\n"
 "<span weight=\"bold\">ÆÄÀϸí:</span>\t%s"
 
-#: src/gtkprefs.c:1629
+#: src/gtkprefs.c:1772
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3470,177 +4053,190 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">ÆÄÀϸí:</span>  %s"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1999
 msgid "Load"
 msgstr "ºÒ·¯¿À±â"
 
-#: src/gtkprefs.c:1814 src/protocols/msn/msn.c:1214
-#: src/protocols/trepia/trepia.c:433
-msgid "Name"
-msgstr "À̸§"
-
-#: src/gtkprefs.c:1861
+#: src/gtkprefs.c:2013
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2061
 msgid "Details"
 msgstr "Á¤º¸"
 
-#: src/gtkprefs.c:1988
+#: src/gtkprefs.c:2188
 msgid "Sound Selection"
 msgstr "¼Ò¸® ¼±ÅÃ"
 
-#: src/gtkprefs.c:2095
+#: src/gtkprefs.c:2295
 msgid "Play"
 msgstr "µè±â"
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2302
 msgid "Event"
 msgstr "À̺¥Æ®"
 
-#: src/gtkprefs.c:2125
+#: src/gtkprefs.c:2321
+msgid "Test"
+msgstr "Å×½ºÆ®"
+
+#: src/gtkprefs.c:2325
 msgid "Reset"
 msgstr "¸®¼Â"
 
-#: src/gtkprefs.c:2129
+#: src/gtkprefs.c:2329
 msgid "Choose..."
 msgstr "¼±ÅÃ"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2464
 msgid "_Edit"
 msgstr "°íÄ¡±â(_E)"
 
-#: src/gtkprefs.c:2289
+#: src/gtkprefs.c:2500
 msgid "Interface"
 msgstr "ÀÎÅÍÆäÀ̽º"
 
-#: src/gtkprefs.c:2290
+#: src/gtkprefs.c:2501
 msgid "Smiley Themes"
 msgstr "½º¸¶Àϸ® Å׸¶"
 
-#: src/gtkprefs.c:2291
+#: src/gtkprefs.c:2502
 msgid "Fonts"
 msgstr "±Û²Ã"
 
-#: src/gtkprefs.c:2292
+#: src/gtkprefs.c:2503
 msgid "Message Text"
 msgstr "¸Þ½ÃÁö ³»¿ë"
 
-#: src/gtkprefs.c:2293
+#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "´ÜÃàÅ°"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2507
 msgid "IMs"
 msgstr "¸Þ½ÅÀú"
 
-#: src/gtkprefs.c:2298
+#: src/gtkprefs.c:2509
+msgid "Network"
+msgstr ""
+
+#: src/gtkprefs.c:2510
 msgid "Proxy"
 msgstr "ÇÁ·Ï½Ã"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2301
+#: src/gtkprefs.c:2513
 msgid "Browser"
 msgstr "ºê¶ó¿ìÀú"
 
-#: src/gtkprefs.c:2303
+#: src/gtkprefs.c:2515
 msgid "Logging"
 msgstr "±â·Ï"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2516
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
-#: src/gtkprefs.c:2305
+#: src/gtkprefs.c:2517
 msgid "Sound Events"
 msgstr "¼Ò¸®"
 
-#: src/gtkprefs.c:2306
+#: src/gtkprefs.c:2518
 msgid "Away / Idle"
 msgstr "ÀÚ¸®ºñ¿ò / »ç¿ë¾ÈÇÔ"
 
-#: src/gtkprefs.c:2307
+#: src/gtkprefs.c:2519
 msgid "Away Messages"
 msgstr "ÀÚ¸®ºñ¿ò"
 
-#: src/gtkprefs.c:2310
+#: src/gtkprefs.c:2522
+#, fuzzy
+msgid "Protocols"
+msgstr "ÇÁ·ÎÅäÄÝ"
+
+#: src/gtkprefs.c:2523
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "¸ðµç »ç¿ëÀÚ°¡ ¿¬¶ôÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "³» Ä£±¸ ¸ñ·Ï¿¡ ÀÖ´Â »ç¿ëÀÚ¸¸ ¿¬¶ôÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "Çã¿ë ¸ñ·Ï¿¡ ÀÖ´Â »ç¿ëÀÚ¸¸ ¿¬¶ôÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "¸ðµç »ç¿ëÀÚ Â÷´Ü"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
+#: src/gtkprivacy.c:81
+#, fuzzy
+msgid "Block only the users below"
 msgstr "Â÷´Ü ¸ñ·Ï¿¡ ÀÖ´Â »ç¿ëÀÚ¸¦ Â÷´Ü"
 
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "ÇÁ¶óÀ̹ö½Ã"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr "°íÄ£ ÇÁ¶óÀ̹ö½Ã ¼³Á¤Àº ¹Ù·Î Àû¿ëµË´Ï´Ù."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr "¼³Á¤ÇÒ °èÁ¤:"
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "»ç¿ëÀÚ Çã¿ë"
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr "¿¬¶ôÀ» Çã¿ëÇÒ »ç¿ëÀÚ¸¦ ÀÔ·ÂÇϼ¼¿ä."
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:571
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "»ó´ëÃø¿¡¼­ÀÇ ¿¬¶ôÀ» Çã¿ëÇÒ »ç¿ëÀÚÀÇ À̸§À» ³ÖÀ¸¼¼¿ä."
 
-#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "Çã¿ë"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:579
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "%s´ÔÀÌ ¿¬¶ôÇÒ ¼ö ÀÖ°Ô Çã°¡ÇÒ±î¿ä?"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:581
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Á¤¸» %s´ÔÀÌ ¿¬¶ôÇÒ ¼ö ÀÖ°Ô Çã°¡ÇÒ±î¿ä?"
 
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "»ç¿ëÀÚ Â÷´Ü"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr "Â÷´ÜÇÒ »ç¿ëÀÚ¸¦ ÀÔ·ÂÇϼ¼¿ä."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:610
 msgid "Please enter the name of the user you wish to block."
 msgstr "Â÷´ÜÇÒ »ç¿ëÀÚÀÇ À̸§À» ³ÖÀ¸¼¼¿ä."
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:617
 #, c-format
 msgid "Block %s?"
 msgstr "%s´ÔÀ» Â÷´ÜÇÒ±î¿ä?"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:619
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Á¤¸» %s´ÔÀ» Â÷´ÜÇÒ±î¿ä?"
@@ -3648,87 +4244,178 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "È®ÀÎ"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "Ãë¼Ò"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "Àû¿ë"
 
-#: src/gtksound.c:60
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+msgid "Close"
+msgstr "´Ý±â"
+
+#: src/gtkroomlist.c:322
+#, fuzzy
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr "ÇöÀç äÆÃÀ» ÇÒ ¼ö ÀÖ´Â ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù."
+
+#: src/gtkroomlist.c:335
+#, fuzzy
+msgid "Room List"
+msgstr "¸ñ·Ï¿¡ ¾øÀ½"
+
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
+msgstr ""
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Ä£±¸°¡ Á¢¼Ó"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Ä£±¸°¡ Á¢¼ÓÀ» ²÷À½"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:64
 msgid "Message received"
 msgstr "¸Þ½ÃÁö ¹ÞÀ½"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "¸Þ½ÃÁö ¹Þ¾Æ¼­ »õ ´ëÈ­°¡ ½ÃÀÛµÊ"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "¸Þ½ÃÁö º¸³¿"
 
-#: src/gtksound.c:65
-msgid "Person enters chat"
-msgstr "»ó´ë°¡ ´ëÈ­½Ç¿¡ µé¾î¿È"
-
-#: src/gtksound.c:66
-msgid "Person leaves chat"
-msgstr "»ó´ë°¡ ´ëÈ­½Ç¿¡¼­ ¶°³²"
-
 #: src/gtksound.c:67
+msgid "Person enters chat"
+msgstr "»ó´ë°¡ ´ëÈ­½Ç¿¡ µé¾î¿È"
+
+#: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr "»ó´ë°¡ ´ëÈ­½Ç¿¡¼­ ¶°³²"
+
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "³»°¡ ´ëÈ­½Ç¿¡¼­ À̾߱âÇÔ"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "´Ù¸¥ »ç¶÷ÀÌ ´ëÈ­½Ç¿¡¼­ À̾߱âÇÔ"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "´ëÈ­½Ç¿¡¼­ ´©±º°¡ ³» À̸§À» ºÎ¸§"
 
-#: src/gtksound.c:153
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "¼±ÅÃµÈ ÆÄÀÏ(%s)ÀÌ ¾ø¾î ¼Ò¸®¸¦ ³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/gtksound.c:169
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 "¼Ò¸® ¿¬ÁÖ ¹æ½ÄÀÌ '¸í·É'À¸·Î ¼±ÅõǾúÁö¸¸ ºñ¾î ÀÖ¾î ¼Ò¸®¸¦ ³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/gtksound.c:178
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "¼³Á¤µÈ ¸í·É(%s)ÀÌ ½ÇÇàµÉ ¼ö ¾ø¾î ¼Ò¸®¸¦ ³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/gtkutils.c:290
+#: src/gtkutils.c:133
 msgid "Can't save icon file to disk."
 msgstr "¾ÆÀÌÄÜ ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/gtkutils.c:325
-msgid "Gaim - Save Icon"
-msgstr "°ÔÀÓ - ¾ÆÀÌÄÜ ÀúÀå"
+#: src/gtkutils.c:168
+#, fuzzy
+msgid "Save Icon"
+msgstr "»õ À̸§À¸·Î ¾ÆÀÌÄÜ ÀúÀå..."
+
+#: src/log.c:106
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+#: src/log.c:476
+msgid "XML"
+msgstr ""
+
+#: src/log.c:561
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:563
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: src/log.c:614 src/log.c:800
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#: src/log.c:624 src/log.c:812
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#: src/log.c:661
+msgid "HTML"
+msgstr ""
+
+#: src/log.c:745
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#: src/log.c:845
+msgid "Plain text"
+msgstr ""
+
+#: src/main.c:155
+#, fuzzy
+msgid "Please create an account."
+msgstr "»ç¿ëÀÚ °èÁ¤À» ÀÔ·ÂÇϼ¼¿ä."
+
+#: src/main.c:237
+msgid "Login"
+msgstr "Á¢¼Ó"
+
+#: src/main.c:255
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "¾ÆÀ̵ð: "
+
+#: src/main.c:269
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "ºñ¹Ð¹øÈ£:"
+
+#: src/main.c:298
+msgid "Sign on"
+msgstr "¿¬°á"
 
 #. full help text
-#: src/gtkutils.c:1038
+#: src/main.c:522
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3741,157 +4428,19 @@
 "                      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"
+"  -c, --config=DIR    use DIR for config files\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
+#: src/main.c:537
 #, 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."
-msgstr "´ëÈ­¸¦ ±â·Ï Áß¿¡ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù."
-
-#: src/log.c:36
-msgid "Unable to find conversation log"
-msgstr "´ëÈ­ ±â·ÏÀ» ãÀ» ¼ö ¾øÀ½"
-
-#: src/log.c:119 src/log.c:140 src/log.c:153
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr "Á¢¼ÓÀ» À§ÇØ %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾øÀ½"
-
-#: src/log.c:207 src/log.c:223
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr "%s´Ô°úÀÇ ¸Þ½ÅÀú ¼¼¼Ç\n"
-
-#: src/log.c:210 src/log.c:226
-#, c-format
-msgid "IM Sessions with %s"
-msgstr "%s´Ô°úÀÇ ¸Þ½ÅÀú ¼¼¼Ç"
-
-#: src/log.c:270
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr "+++ %s (%s) ¿¬°á @ %s"
-
-#: src/log.c:275
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr "+++ %s (%s) ¿¬°á ²÷±è @ %s"
-
-#: src/log.c:280
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr "+++ %s (%s)´ÔÀÇ ÀÚ¸®ºñ¿ò »óÅ ¹Ù²ñ @ %s"
-
-#: src/log.c:285
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr "+++ %s (%s) µ¹¾Æ¿È @ %s"
-
-#: src/log.c:290
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr "+++ %s (%s) »ç¿ë¾ÈÇÔ @ %s"
-
-#: src/log.c:295
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr "+++ %s (%s) »ç¿ë¾ÈÇÔ¿¡¼­ µ¹¾Æ¿È @ %s"
-
-#: src/log.c:300
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr "+++ ÇÁ·Î±×·¥ ¸¶Ä§ @ %s"
-
-#: src/log.c:307
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:312
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:317
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:322
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:327
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:333
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:345
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:371
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:140
-msgid "Please enter your login."
-msgstr "»ç¿ëÀÚ °èÁ¤À» ÀÔ·ÂÇϼ¼¿ä."
-
-#: src/main.c:223
-msgid "<New User>"
-msgstr "<»õ »ç¿ëÀÚ>"
-
-#: src/main.c:265
-msgid "Login"
-msgstr "Á¢¼Ó"
-
-#: src/main.c:281
-msgid "Screen Name:"
-msgstr "¾ÆÀ̵ð: "
-
-#: src/plugin.c:257
+#: src/plugin.c:277
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3899,95 +4448,106 @@
 msgstr ""
 "%s Ç÷¯±×ÀÎÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù. ÀÌ Ç÷¯±×ÀÎÀ» ¼³Ä¡ÇÏ°í ´Ù½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/plugin.c:262 src/plugin.c:290
+#: src/plugin.c:282 src/plugin.c:310
 msgid "Gaim was unable to load your plugin."
 msgstr "°ÔÀÓÀÌ Ç÷¯±×ÀÎÀ» ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/plugin.c:286
+#: src/plugin.c:306
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "%s Ç÷¯±×ÀÎÀ» ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/prefs.c:113 src/status.c:270
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr ""
 
-#: 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/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360 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:1255
-#: src/protocols/yahoo/yahoo.c:1334
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Ä£±¸µé¿¡°Ô¸¸ ¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 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
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Ä£±¸µé¿¡°Ô¸¸ º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ¾øÀ½"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "È£½ºÆ®ÀÇ IP¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/jabber.c:104
 msgid "Invalid response from server."
 msgstr "¼­¹ö·ÎºÎÅÍ À¯È¿ÇÏÁö ¾ÊÀº ÀÀ´äÀÌ ¿Ô½À´Ï´Ù."
 
+#: src/protocols/gg/gg.c:145
+msgid "Error while reading from socket."
+msgstr "¼ÒÄÏ¿¡¼­ Àд Áß¿¡ ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
+
 #: src/protocols/gg/gg.c:148
-msgid "Error while reading from socket."
-msgstr "¼ÒÄÏ¿¡¼­ Àд Áß¿¡ ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
+msgid "Error while writing to socket."
+msgstr "¼ÒÄÏ¿¡ ¾²´Â Áß¿¡ ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
 
 #: src/protocols/gg/gg.c:151
-msgid "Error while writing to socket."
-msgstr "¼ÒÄÏ¿¡ ¾²´Â Áß¿¡ ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
+msgid "Authentication failed."
+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:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "»óÅÂ: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "¼ÒÄÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:208
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
@@ -4012,7 +4572,7 @@
 msgstr "GG ¶óÀ̺귯¸®¿¡¼­ Ä¡¸íÀûÀÎ ¿À·ù\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:184
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s·ÎÀÇ ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
@@ -4049,21 +4609,30 @@
 msgid "Active"
 msgstr "È°¼ºÈ­"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3952
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:671
-msgid "First name"
+#. First Name
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+msgid "First Name"
+msgstr "¼º"
+
+#. Last Name
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+msgid "Last Name"
 msgstr "À̸§"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1379
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 msgid "Nick"
 msgstr "º°¸í"
 
 #: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
-msgid "Birth year"
+#, fuzzy
+msgid "Birth Year"
 msgstr "»ý³â"
 
 #: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
@@ -4071,43 +4640,62 @@
 msgid "Sex"
 msgstr "¼ºº°"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
+msgid "City"
+msgstr "½Ã/±º"
+
+#. res[0] == username
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#, fuzzy
+msgid "Buddy Information"
+msgstr "Á÷Àå Á¤º¸"
+
+#: src/protocols/gg/gg.c:744
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu ¼­¹ö¿¡ Ä£±¸ ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:752
 msgid "Couldn't Import Buddy List from Server"
 msgstr "¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·ÏÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:815
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Gadu-Gadu ¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·ÏÀ» ¼º°øÀûÀ¸·Î °¡Á®¿Ô½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:823
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Gadu-Gadu ¼­¹ö·Î Ä£±¸ ¸ñ·ÏÀ» º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Gadu-Gadu ¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·ÏÀ» Áö¿ü½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Gadu-Gadu ¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·ÏÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:840
-msgid "Password changed successfully"
-msgstr "ºñ¹Ð¹øÈ£¸¦ ¼º°øÀûÀ¸·Î ¹Ù²Ù¾ú½À´Ï´Ù."
-
 #: src/protocols/gg/gg.c:847
+msgid "Password changed successfully"
+msgstr "ºñ¹Ð¹øÈ£¸¦ ¼º°øÀûÀ¸·Î ¹Ù²Ù¾ú½À´Ï´Ù."
+
+#: src/protocols/gg/gg.c:854
 msgid "Password couldn't be changed"
 msgstr "ºñ¹Ð¹øÈ£¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:971
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Gadu-Gadu ¼­¹ö¿¡ ¿¬°á ¿À·ù"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:972
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4115,11 +4703,11 @@
 "°ÔÀÓÀÌ Gadu-Gadu HTTP ¼­¹ö ¿¬°á ¿À·ù·Î ÀÎÇØ ¿äûÀÌ ¿Ï·áµÇÁö ¾Ê¾Ò½À´Ï´Ù.Àá½Ã "
 "ÈÄ¿¡ ´Ù½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu Ä£±¸ ¸ñ·ÏÀ» °¡Á®¿Ã ¼ö ¾øÀ½"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:1001
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4127,25 +4715,25 @@
 "°ÔÀÓÀÌ Gadu-Gadu Ä£±¸ ¸ñ·Ï ¼­¹ö¿¡ ¿¬°áÇÏÁö ¸øÇß½À´Ï´Ù. Àá½Ã ÈÄ¿¡ ´Ù½Ã ½ÃµµÇÏ"
 "¼¼¿ä."
 
-#: src/protocols/gg/gg.c:1063
+#: src/protocols/gg/gg.c:1074
 msgid "Couldn't export buddy list"
 msgstr "Ä£±¸ ¸ñ·ÏÀ» ³»º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:1064 src/protocols/gg/gg.c:1087
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "°ÔÀÓÀÌ Ä£±¸ ¸ñ·Ï ¼­¹ö¿¡ ¿¬°áÇÏÁö ¸øÇß½À´Ï´Ù. Àá½Ã ÈÄ¿¡ ´Ù½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/protocols/gg/gg.c:1086
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Gadu-Gadu Ä£±¸ ¸ñ·ÏÀ» Áö¿ï ¼ö ¾øÀ½"
 
-#: src/protocols/gg/gg.c:1135
+#: src/protocols/gg/gg.c:1146
 msgid "Unable to access directory"
 msgstr "µð·ºÅ丮¿¡ Á¢±ÙÇÒ ¼ö ¾øÀ½"
 
-#: src/protocols/gg/gg.c:1136
+#: src/protocols/gg/gg.c:1147
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4153,11 +4741,11 @@
 "°ÔÀÓÀÌ µð·ºÅ丮 ¼­¹ö¿¡ Á¢¼ÓÇÒ ¼ö ¾ø¾î µð·ºÅ丮 ã±â¿¡ ½ÇÆÐÇß½À´Ï´Ù. Àá½Ã ÈÄ"
 "¿¡ ´Ù½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Gadu-Gadu ºñ¹Ð¹øÈ£¸¦ ¹Ù²Ü ¼ö ¾øÀ½"
 
-#: src/protocols/gg/gg.c:1170
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4165,27 +4753,32 @@
 "°ÔÀÓÀÌ Gadu-Gadu ¼­¹ö ¿¬°á ¿À·ù·Î ºñ¹Ð¹øÈ£¸¦ ¹Ù²ÙÁö ¸øÇß½À´Ï´Ù. Àá½Ã ÈÄ¿¡ ´Ù"
 "½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/protocols/gg/gg.c:1186
+#: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "µð·ºÅ丮¿¡¼­ ã±â"
 
-#: src/protocols/gg/gg.c:1202
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: src/protocols/toc/toc.c:1546
+msgid "Change Password"
+msgstr "ºñ¹Ð¹øÈ£ ¹Ù²Ù±â"
+
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·Ï °¡Á®¿À±â"
 
-#: src/protocols/gg/gg.c:1208
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "Ä£±¸ ¸ñ·ÏÀ» ¼­¹ö·Î º¸³»±â"
 
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "¼­¹ö¿¡¼­ Ä£±¸ ¸ñ·Ï Áö¿ì±â"
 
-#: src/protocols/gg/gg.c:1247
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "»ç¿ëÀÚ ¼Ò°³¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:1248
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4203,7 +4796,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1360 src/protocols/gg/gg.c:1362
+#. *  description
+#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "°¡µÎ-°¡µÎ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
@@ -4216,15 +4810,17 @@
 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/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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr "ÀÎÁõ"
 
-#: 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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr "°ÅºÎ"
 
@@ -4244,12 +4840,12 @@
 msgid "Gaim User"
 msgstr "°ÔÀÓ »ç¿ëÀÚ"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr "¾Ë·ÁÁöÁö ¾ÊÀº ¸í·É: %s"
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
@@ -4259,7 +4855,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
@@ -4267,29 +4863,90 @@
 "<B>Áö¿øµÇ´Â IRC ¸í·É:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "ÇöÀç ÅäÇÈ: %s"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "ÅäÇÈÀÌ ¾øÀ½"
 
-#: src/protocols/irc/irc.c:121
-msgid "Channel:"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/yahoo/yahoo_filexfer.c:217
+msgid "File Transfer Aborted"
+msgstr "ÆÄÀÏ Àü¼Û Ãë¼Ò"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr ""
+
+#: src/protocols/irc/irc.c:73
+msgid "Error displaying MOTD"
+msgstr ""
+
+#: src/protocols/irc/irc.c:73
+#, fuzzy
+msgid "No MOTD available"
+msgstr "»ç¿ëÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/irc/irc.c:74
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#: src/protocols/irc/irc.c:77
+#, c-format
+msgid "MOTD for %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:140
+msgid "View MOTD"
+msgstr ""
+
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoo.c:2456
+msgid "Send File"
+msgstr "ÆÄÀÏ º¸³»±â"
+
+#: src/protocols/irc/irc.c:168
+#, fuzzy
+msgid "_Channel:"
 msgstr "ä³Î:"
 
-#: src/protocols/irc/irc.c:159 src/protocols/oscar/oscar.c:684
-#: src/protocols/toc/toc.c:236
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#, fuzzy
+msgid "_Password:"
+msgstr "ºñ¹Ð¹øÈ£:"
+
+#: src/protocols/irc/irc.c:193
+msgid "IRC nicks may not contain whitespace"
+msgstr ""
+
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "¿¬°á: %s"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr "¼ÒÄÏÀ» ¸¸µé ¼ö ¾øÀ½"
 
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+msgid "Read error"
+msgstr "Àб⠿À·ù"
+
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "»ç¿ëÀÚ(_U)"
+
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "ÁÖÁ¦:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4299,155 +4956,190 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:487
+#: src/protocols/irc/irc.c:613
 msgid "IRC Protocol Plugin"
 msgstr "IRC ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
 #. *  summary
-#: src/protocols/irc/irc.c:488
+#: src/protocols/irc/irc.c:614
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Á» ´ú ³ª»Û IRC ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#. 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
+#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "¼­¹ö"
 
-#: src/protocols/irc/irc.c:511
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
+#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
+#: src/protocols/trepia/trepia.c:1307
+msgid "Port"
+msgstr "Æ÷Æ®"
+
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "ÀÎÄÚµù"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
+msgid "Username"
+msgstr "»ç¿ëÀÚÀ̸§"
+
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "À߸øµÈ ¸ðµå"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "%s¿¡¼­ ¹êµÇ¾ú½À´Ï´Ù."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "¹êµÊ"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:193
-msgid "Username"
-msgstr "»ç¿ëÀÚÀ̸§"
-
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:1482
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "½ÇÁ¦À̸§"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>ÀÚ¸®ºñ¿ò:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "¿¬°á ½Ã±â"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, fuzzy, c-format
+msgid "Buddy Information for %s"
+msgstr "Ãß°¡Á¤º¸"
+
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s´ÔÀÌ ÁÖÁ¦¸¦ ¹Ù²Þ: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:299
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "'%s'Àº(´Â) ¾Ë ¼ö ¾ø´Â ¸Þ½ÃÁöÀÔ´Ï´Ù."
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:300
 msgid "Unknown message"
 msgstr "¾Ë ¼ö ¾ø´Â ¸Þ½ÃÁö"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:300
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "°ÔÀÓÀº IRC ¼­¹ö°¡ º¸³½ ¸Þ½ÃÁö¸¦ ÀÌÇØÇÒ ¼ö ¾ø½À´Ï´Ù."
 
+#: src/protocols/irc/msgs.c:403
+#, fuzzy
+msgid "No such channel"
+msgstr "±×·± ä³ÎÀÌ ¾øÀ½"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:414
 msgid "no such channel"
 msgstr "±×·± ä³ÎÀÌ ¾øÀ½"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:417
 msgid "User is not logged in"
 msgstr "Á¢¼ÓµÇÁö ¾ÊÀ½"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:422
 msgid "No such nick or channel"
 msgstr "±×·± ´ëÈ­¸íÀ̳ª ä³ÎÀÌ ¾øÀ½"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:442
 msgid "Could not send"
 msgstr "º¸³¾ ¼ö ¾øÀ½"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s¿¡´Â ÃÊ´ë¹Þ¾Æ¾ß µé¾î°¥ ¼ö ÀÖ½À´Ï´Ù."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr "ÃÊ´ëÀÚ¸¸"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:595
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s´Ô¿¡°Ô °­Á¦ÅðÀåµÇ¾ú½À´Ï´Ù: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s´Ô¿¡°Ô °­Á¦ÅðÀåµÊ(%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:667
+#: src/protocols/irc/msgs.c:700
+#, fuzzy
+msgid "Could not change nick"
+msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/irc/msgs.c:701
+msgid "Cannot change nick"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "%s%s ä³ÎÀ» ³ª°¬À½"
 
-#: src/protocols/irc/msgs.c:705
+#: src/protocols/irc/msgs.c:762
 msgid "Error: invalid PONG from server"
 msgstr "¿À·ù: ¼­¹ö¿¡¼­ À߸øµÈ PONGÀÌ µµÂø"
 
-#: src/protocols/irc/msgs.c:707
+#: src/protocols/irc/msgs.c:764
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:795
+#: src/protocols/irc/msgs.c:839
+#, fuzzy, c-format
+msgid "Cannot join %s:"
+msgstr "%sÀÇ Á¤º¸ ¹Ù²Ù±â:"
+
+#: src/protocols/irc/msgs.c:840
+#, fuzzy
+msgid "Cannot join channel"
+msgstr "±×·± ä³ÎÀÌ ¾øÀ½"
+
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:158
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4455,282 +5147,138 @@
 "(ÀÌ ¸Þ½ÃÁö¿¡¼­ º¯È¯ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù.  °èÁ¤ ÆíÁý±â¿¡¼­ 'ÀÎÄÚµù' ¿É¼ÇÀ» È®"
 "ÀÎÇϼ¼¿ä.)"
 
-#: src/protocols/irc/parse.c:273
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:274
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:274
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:373
-msgid "Disconnected"
-msgstr "²÷¾îÁü"
-
-#: 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"
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
+#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+msgid "Disconnected."
+msgstr "²÷¾îÁü."
+
+#: src/protocols/jabber/auth.c:51
+msgid "Server requires SSL for login"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:111
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#, fuzzy
+msgid "Plaintext Authentication"
 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/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
+#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:375
+#, fuzzy
+msgid "Invalid challenge from server"
+msgstr "¼­¹ö·ÎºÎÅÍ À¯È¿ÇÏÁö ¾ÊÀº ÀÀ´äÀÌ ¿Ô½À´Ï´Ù."
+
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "À̸§"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "¼º"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "À̸§"
 
-#: src/protocols/jabber/jabber.c:3630 src/protocols/yahoo/yahoo.c:1478
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "´ëÈ­¸í"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+msgid "URL"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "°Å¸® ÁÖ¼Ò"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "³ª¸ÓÁö ÁÖ¼Ò"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "À§Ä¡"
 
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Áö¿ª"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "¿ìÆí¹øÈ£"
 
-#: src/protocols/jabber/jabber.c:3638
+#. Country
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+msgid "Country"
+msgstr "±¹°¡"
+
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "ÀüÈ­"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+msgid "Email"
+msgstr "¸ÞÀÏ"
+
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "±â°ü À̸§"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "±â°ü ºÎ¼­"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Á¦¸ñ"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "¿ªÇÒ"
 
-#: src/protocols/jabber/jabber.c:3644 src/protocols/oscar/oscar.c:3986
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "»ý³â¿ùÀÏ"
 
-#: src/protocols/jabber/jabber.c:4102 src/protocols/jabber/jabber.c:4103
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard °íÄ¡±â"
 
-#: src/protocols/jabber/jabber.c:4104
+#: src/protocols/jabber/buddy.c:510
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4738,18 +5286,624 @@
 "³ª¿­µÈ ¸ðµç Ç׸ñÀº ¼±ÅûçÇ×ÀÔ´Ï´Ù. ÀÔ·ÂÇصµ ¹«¹æÇÏ´Ù°í »ý°¢ÇÏ´Â Á¤º¸¸¸ ÀÔ·ÂÇÏ"
 "¼¼¿ä."
 
-#: src/protocols/jabber/jabber.c:4177
-msgid "Server Registration successful!"
+#: src/protocols/jabber/buddy.c:552
+msgid "Jabber ID"
+msgstr "Àç¹ö ¾ÆÀ̵ð"
+
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/yahoo/yahoo.c:2407
+msgid "Status"
+msgstr "»óÅÂ"
+
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+msgid "Resource"
+msgstr "ÀÚ¿ø"
+
+#: src/protocols/jabber/buddy.c:624
+msgid "Middle Name"
+msgstr "Áß°£ À̸§"
+
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+msgid "Address"
+msgstr "°Å¸® ÁÖ¼Ò"
+
+#: src/protocols/jabber/buddy.c:655
+msgid "P.O. Box"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:761
+#, fuzzy
+msgid "Photo"
+msgstr "Æ÷Æ®"
+
+#: src/protocols/jabber/buddy.c:761
+#, fuzzy
+msgid "Logo"
+msgstr "·Î±×"
+
+#: src/protocols/jabber/buddy.c:777
+#, fuzzy
+msgid "Jabber Profile"
+msgstr "ÇÁ·ÎÇÊ ¼³Á¤"
+
+#: src/protocols/jabber/buddy.c:893
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:896
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:905
+msgid "Cancel Presence Notification"
+msgstr "Á¤º¸ Ç¥½Ã Ãë¼Ò"
+
+#: src/protocols/jabber/buddy.c:913
+#, fuzzy
+msgid "(Re-)Request authorization"
+msgstr "ÀÎÁõ Àç¿äû"
+
+#: src/protocols/jabber/buddy.c:919
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#, fuzzy
+msgid "_Room:"
+msgstr "´ëÈ­½Ç:"
+
+#: src/protocols/jabber/chat.c:47
+#, fuzzy
+msgid "_Server:"
+msgstr "¼­¹ö:"
+
+#: src/protocols/jabber/chat.c:53
+#, fuzzy
+msgid "_Handle:"
+msgstr "ó¸®:"
+
+#: src/protocols/jabber/chat.c:164
+#, fuzzy, c-format
+msgid "%s is not a valid room name"
+msgstr "%s Àº(/´Â) À߸øµÈ ÆÄÀϸíÀÔ´Ï´Ù.\n"
+
+#: src/protocols/jabber/chat.c:165
+#, fuzzy
+msgid "Invalid Room Name"
+msgstr "À߸øµÈ ±×·ì À̸§"
+
+#: src/protocols/jabber/chat.c:170
+#, fuzzy, c-format
+msgid "%s is not a valid server name"
+msgstr "%s Àº(/´Â) À߸øµÈ ÆÄÀϸíÀÔ´Ï´Ù.\n"
+
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "À߸øµÈ ´ëÈ­¸í"
+
+#: src/protocols/jabber/chat.c:176
+#, fuzzy, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s Àº(/´Â) À߸øµÈ ÆÄÀϸíÀÔ´Ï´Ù.\n"
+
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#, fuzzy
+msgid "Invalid Room Handle"
+msgstr "À߸øµÈ ±×·ì À̸§"
+
+#: src/protocols/jabber/chat.c:332
+#, fuzzy
+msgid "Configuration error"
+msgstr "¿¬°á ¿À·ù"
+
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#, fuzzy
+msgid "Unable to configure"
+msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: src/protocols/jabber/chat.c:357
+#, fuzzy
+msgid "Room Configuration Error"
+msgstr "°¡ÀÔ ¿À·ù"
+
+#: src/protocols/jabber/chat.c:358
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#, fuzzy
+msgid "Registration error"
+msgstr "°¡ÀÔ ¿À·ù"
+
+#: src/protocols/jabber/chat.c:556
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "°¡ÀÔ ¿À·ù"
+
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#, fuzzy
+msgid "Error retreiving roomlist"
+msgstr "¼­¹ö¿¡¼­ Àд Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
+
+#: src/protocols/jabber/chat.c:652
+#, fuzzy
+msgid "Invalid Server"
+msgstr "À߸øµÈ ¿À·ù"
+
+#: src/protocols/jabber/chat.c:689
+msgid "Enter a Conference Server"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:690
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:693
+msgid "Find Rooms"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:74
+msgid "Error initializing session"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
+msgid "Write error"
+msgstr "¾²±â ¿À·ù"
+
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#, fuzzy
+msgid "Read Error"
+msgstr "Àб⠿À·ù"
+
+#: src/protocols/jabber/jabber.c:317
+#, fuzzy
+msgid "Connection Failed"
+msgstr "¿¬°áÀÌ ²÷°å½À´Ï´Ù."
+
+#: src/protocols/jabber/jabber.c:320
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#, fuzzy
+msgid "Invalid Jabber ID"
+msgstr "Àç¹ö ¾ÆÀ̵ð"
+
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#, fuzzy
+msgid "SSL support unavailable"
+msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/trepia/trepia.c:1070
+msgid "Unable to create socket"
+msgstr "¼ÒÄÏÀ» ¸¸µé ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:426
+#, fuzzy, c-format
+msgid "Registration of %s@%s successful"
+msgstr "¼­¹ö¿¡ µî·ÏÀÌ ¼º°øÇß½À´Ï´Ù!"
+
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#, fuzzy
+msgid "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 "¾Ë ¼ö ¾ø´Â °¡ÀÔ ¿À·ù"
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#, fuzzy
+msgid "Unknown Error"
+msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯"
+
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#, fuzzy
+msgid "Registration Failed"
+msgstr "°¡ÀÔ ¿À·ù"
+
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#, fuzzy
+msgid "Already Registered"
+msgstr "ÀÌ¹Ì ÀÖÀ½"
+
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#, fuzzy
+msgid "Password"
+msgstr "ºñ¹Ð¹øÈ£(_S)"
+
+#: src/protocols/jabber/jabber.c:596
+#, fuzzy
+msgid "E-Mail"
+msgstr "¸ÞÀÏ"
+
+#. State
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
+msgid "State"
+msgstr "½Ã/µµ"
+
+#: src/protocols/jabber/jabber.c:636
+#, fuzzy
+msgid "Phone"
+msgstr "º¸¿©ÁÖÁö ¾ÊÀ½"
+
+#: src/protocols/jabber/jabber.c:646
+msgid "Date"
+msgstr "³¯Â¥"
+
+#: src/protocols/jabber/jabber.c:654
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+msgid "Register New Jabber Account"
+msgstr ""
+
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
+msgid "Connecting"
+msgstr "¿¬°á Áß"
+
+#: src/protocols/jabber/jabber.c:779
+msgid "Initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:785
+msgid "Authenticating"
+msgstr "ÀÎÁõ È®ÀÎ Áß"
+
+#: src/protocols/jabber/jabber.c:794
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+msgid "Not Authorized"
+msgstr "ÀÎÁõ ¾ÈµÊ"
+
+#: src/protocols/jabber/jabber.c:905
+#, fuzzy
+msgid "Both"
+msgstr "¾Æ·¡"
+
+#: src/protocols/jabber/jabber.c:907
+msgid "From (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:909
+msgid "From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:912
+#, fuzzy
+msgid "To"
+msgstr "ˤ"
+
+#: src/protocols/jabber/jabber.c:914
+msgid "None (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:918
+#, fuzzy
+msgid "Subscription"
+msgstr "¼³¸í"
+
+#: src/protocols/jabber/jabber.c:938
+msgid "Error"
+msgstr "¿À·ù"
+
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+msgid "Chatty"
+msgstr "äƼ"
+
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+msgid "Extended Away"
+msgstr "ÀÚ¸®ºñ¿ò"
+
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
+msgid "Do Not Disturb"
+msgstr "¹æÇرÝÁö"
+
+#: src/protocols/jabber/jabber.c:971
+#, fuzzy
+msgid "Password Changed"
+msgstr "ºñ¹Ð¹øÈ£¸¦ ¼º°øÀûÀ¸·Î ¹Ù²Ù¾úÀ½"
+
+#: src/protocols/jabber/jabber.c:972
+#, fuzzy
+msgid "Your password has been changed."
+msgstr "ºñ¹Ð¹øÈ£¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#, fuzzy
+msgid "Error changing password"
+msgstr "%sÀÇ ºñ¹Ð¹øÈ£ ¹Ù²Ù±â:"
+
+#: src/protocols/jabber/jabber.c:1031
+#, fuzzy
+msgid "Password (again)"
+msgstr "»õ ºñ¹Ð¹øÈ£ (´Ù½Ã)"
+
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#, fuzzy
+msgid "Change Jabber Password"
+msgstr "ºñ¹Ð¹øÈ£ ¹Ù²Ù±â"
+
+#: src/protocols/jabber/jabber.c:1037
+#, fuzzy
+msgid "Please enter your new password"
+msgstr "ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇϼ¼¿ä"
+
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "»ç¿ëÀÚ Á¤º¸ ÀÔ·Â"
+
+#: src/protocols/jabber/jabber.c:1133
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1135
+#, fuzzy
+msgid "Conflict"
+msgstr "¿¬°á"
+
+#: src/protocols/jabber/jabber.c:1137
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1139
+#, fuzzy
+msgid "Forbidden"
+msgstr "¼û±è"
+
+#: src/protocols/jabber/jabber.c:1141
+#, fuzzy
+msgid "Gone"
+msgstr "º¸¿©ÁÖÁö ¾ÊÀ½"
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#, fuzzy
+msgid "Internal Server Error"
+msgstr "³»ºÎ ¼­¹ö ¿À·ù"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+#, fuzzy
+msgid "Malformed Jabber ID"
+msgstr "Àç¹ö ¾ÆÀ̵ð"
+
+#: src/protocols/jabber/jabber.c:1149
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "»ç¿ëÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:1151
+#, fuzzy
+msgid "Not Allowed"
+msgstr "»ç¿ëÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:1155
+msgid "Payment Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1157
+#, fuzzy
+msgid "Recipient Unavailable"
+msgstr "¼­ºñ½º ºÒ°¡´É"
+
+#: src/protocols/jabber/jabber.c:1161
+#, fuzzy
+msgid "Registration Required"
+msgstr "°¡ÀÔ ¿À·ù"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1167
+#, fuzzy
+msgid "Server Overloaded"
+msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:1169
+#, fuzzy
+msgid "Service Unavailable"
+msgstr "¼­ºñ½º ºÒ°¡´É"
+
+#: src/protocols/jabber/jabber.c:1171
+#, fuzzy
+msgid "Subscription Required"
+msgstr "ÀÎÁõ ¿äû"
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1180
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "ÀÎÁõÀÌ Çã¶ôµÊ"
+
+#: src/protocols/jabber/jabber.c:1182
+#, fuzzy
+msgid "Incorrect encoding in authorization"
+msgstr "<i>ÀÎÁõÀ» ±â´Ù¸®°í ÀÖÁö ¾ÊÀ½<i>"
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1188
+#, fuzzy
+msgid "Invalid Authorization Mechanism"
+msgstr "ÀÎÁõÀÌ °ÅÀýµÊ"
+
+#: src/protocols/jabber/jabber.c:1191
+#, fuzzy
+msgid "Authorization mechanism too weak"
+msgstr "ÀÎÁõÀÌ °ÅÀýµÊ"
+
+#: src/protocols/jabber/jabber.c:1196
+#, fuzzy
+msgid "Temporary Authentication Failure"
+msgstr "ÀÎÁõ ½ÇÆÐ."
+
+#: src/protocols/jabber/jabber.c:1198
+#, fuzzy
+msgid "Authentication Failure"
+msgstr "ÀÎÁõ ½ÇÆÐ."
+
+#: src/protocols/jabber/jabber.c:1202
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1204
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1207
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "ÀÚ¿ø"
+
+#: src/protocols/jabber/jabber.c:1209
+#, fuzzy
+msgid "Connection Timeout"
+msgstr "¿¬°á ²÷±è"
+
+#: src/protocols/jabber/jabber.c:1211
+#, fuzzy
+msgid "Host Gone"
+msgstr "¿ìÆí¹øÈ£"
+
+#: src/protocols/jabber/jabber.c:1213
+#, fuzzy
+msgid "Host Unknown"
+msgstr "¾Ë·ÁÁöÁö ¾ÊÀ½"
+
+#: src/protocols/jabber/jabber.c:1215
+#, fuzzy
+msgid "Improper Addressing"
+msgstr "Á÷Àå ÁÖ¼Ò"
+
+#: src/protocols/jabber/jabber.c:1219
+#, fuzzy
+msgid "Invalid ID"
+msgstr "À߸øµÈ »ç¿ëÀÚ"
+
+#: src/protocols/jabber/jabber.c:1221
+#, fuzzy
+msgid "Invalid Namespace"
+msgstr "À߸øµÈ »ç¿ëÀÚ"
+
+#: src/protocols/jabber/jabber.c:1223
+#, fuzzy
+msgid "Invalid XML"
+msgstr "À߸øµÈ SNAC"
+
+#: src/protocols/jabber/jabber.c:1225
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1231
+#, fuzzy
+msgid "Remote Connection Failed"
+msgstr "¸®¸ðÄÜ"
+
+#: src/protocols/jabber/jabber.c:1233
+#, fuzzy
+msgid "Resource Constraint"
+msgstr "¸®¸ðÄÜ"
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1239
+#, fuzzy
+msgid "System Shutdown"
+msgstr "½Ã½ºÅÛ ·Î±×"
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "Unsupported Encoding"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1245
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1247
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1249
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1251
+#, fuzzy
+msgid "Stream Error"
+msgstr "³»ºÎ ¿À·ù"
+
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
+msgstr ""
 
 #. *< api_version
 #. *< type
@@ -4761,259 +5915,432 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4401 src/protocols/jabber/jabber.c:4403
+#. *  description
+#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/jabber/jabber.c:4425
-msgid "Resource"
-msgstr "ÀÚ¿ø"
-
-#: src/protocols/jabber/jabber.c:4433
+#: src/protocols/jabber/jabber.c:1389
+#, fuzzy
+msgid "Use TLS if available"
+msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ¾øÀ½"
+
+#: src/protocols/jabber/jabber.c:1394
+msgid "Force old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1399
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1408
 msgid "Connect server"
 msgstr "¼­¹ö ¿¬°á"
 
-#: 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"
+#: src/protocols/jabber/message.c:111
+#, fuzzy, c-format
+msgid "Message from %s"
+msgstr "¸Þ½ÃÁö ·Î±×"
+
+#: src/protocols/jabber/message.c:173
+#, fuzzy, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s´ÔÀÌ ÁÖÁ¦¸¦ ¹Ù²Þ: %s"
+
+#: src/protocols/jabber/message.c:175
+#, fuzzy, c-format
+msgid "The topic is: %s"
+msgstr "ÇöÀç ÅäÇÈ: %s"
+
+#: src/protocols/jabber/message.c:225
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+#: src/protocols/jabber/message.c:228
+#, fuzzy
+msgid "Jabber Message Error"
+msgstr "Àç¹ö ¿À·ù"
+
+#: src/protocols/jabber/message.c:291
+#, c-format
+msgid " (Code %s)"
+msgstr ""
+
+#: src/protocols/jabber/parser.c:131
+#, fuzzy
+msgid "XML Parse error"
+msgstr "¾²±â ¿À·ù"
+
+#: src/protocols/jabber/presence.c:221
+msgid "Unknown Error in presence"
+msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯ ¹ß»ý"
+
+#: src/protocols/jabber/presence.c:224
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "%s´ÔÀÌ ³ª¸¦ ÀÚ½ÅÀÇ Ä£±¸ ¸ñ·Ï¿¡ µî·ÏÇÏ·Á°í ÇÕ´Ï´Ù."
+
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+msgid "Create New Room"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:279
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:281
+msgid "Configure Room"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:283
+msgid "Accept Defaults"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:303
+#, fuzzy, c-format
+msgid "Error in chat %s"
+msgstr "À̹ÌÁö ÀúÀå ¿À·ù: %s"
+
+#: src/protocols/jabber/presence.c:306
+#, fuzzy, c-format
+msgid "Error joining chat %s"
+msgstr "À̹ÌÁö ÀúÀå ¿À·ù: %s"
+
+#: src/protocols/jabber/si.c:579
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#, fuzzy
+msgid "File Send Failed"
+msgstr "ÆÄÀÏ º¸³»±â"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#, fuzzy
+msgid "Unable to request USR\n"
 msgstr "INF ¿äû ºÒ°¡´É"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:249
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr "MD5¸¦ »ç¿ëÇؼ­ Á¢¼ÓÇÒ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/dispatch.c:77 src/protocols/msn/notification.c:258
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr "USRÀ» º¸³¾ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "ºñ¹Ð¹øÈ£¸¦ º¸³»´Â Áß"
 
-#: src/protocols/msn/dispatch.c:99 src/protocols/msn/notification.c:1165
+#: src/protocols/msn/dispatch.c:104
+#, fuzzy
+msgid "Protocol version not supported"
+msgstr "Áö¿øÇÏÁö ¾Ê´Â ÇÁ·ÎÅäÄÝ"
+
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#, fuzzy
+msgid "Unable to request CVR\n"
+msgstr "INF ¿äû ºÒ°¡´É"
+
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#, fuzzy
+msgid "Unable to request INF\n"
+msgstr "INF ¿äû ºÒ°¡´É"
+
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:126
+#: src/protocols/msn/dispatch.c:178
 msgid "Unable to transfer"
 msgstr "Àü¼ÛÇÒ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/dispatch.c:147
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr "¸Þ½ÃÁö¸¦ ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:404
-#: src/protocols/msn/notification.c:1389
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr "¼­¹ö¿¡ µ¥ÀÌÅ͸¦ º¸³¾ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1396
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "¼­¹ö¿Í µ¿±âÈ­"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1410
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr "¼­¹ö¿¡¼­ Àд Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù."
 
 #: src/protocols/msn/error.c:33
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "¸Þ½ÃÁö¸¦ ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "±¸¹® ¿À·ù (°ÔÀÓÀÇ ¹ö±×ÀÏ ¼ö ÀÖÀ½)"
 
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "À߸øµÈ ÆĶó¸ÞÅÍ (°ÔÀÓÀÇ ¹ö±×ÀÏ ¼ö ÀÖÀ½)"
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr "À߸øµÈ »ç¿ëÀÚ"
-
-#: src/protocols/msn/error.c:44
-msgid "Fully Qualified Domain Name missing"
-msgstr "µµ¸ÞÀÎ À̸§ÀÌ ºüÁ³À½"
+#, fuzzy
+msgid "Invalid email address"
+msgstr "¸ÞÀÏ ÁÖ¼Ò"
+
+#: src/protocols/msn/error.c:43
+#, fuzzy
+msgid "User does not exist"
+msgstr "ÆÄÀÏÀÌ ¾ø½À´Ï´Ù."
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
-msgstr "ÀÌ¹Ì ·Î±äµÊ"
+msgid "Fully Qualified Domain Name missing"
+msgstr "µµ¸ÞÀÎ À̸§ÀÌ ºüÁ³À½"
 
 #: src/protocols/msn/error.c:50
+#, fuzzy
+msgid "Already Logged In"
+msgstr "ÀÌ¹Ì ·Î±äµÊ"
+
+#: src/protocols/msn/error.c:53
 msgid "Invalid Username"
 msgstr "À߸øµÈ »ç¿ëÀÚ À̸§"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:56
 msgid "Invalid Friendly Name"
 msgstr "À߸øµÈ ´ëÈ­¸í"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:59
 msgid "List Full"
 msgstr "¸ñ·ÏÀÌ ²ËÂü"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:62
 msgid "Already there"
 msgstr "ÀÌ¹Ì ÀÖÀ½"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:65
 msgid "Not on list"
 msgstr "¸ñ·Ï¿¡ ¾øÀ½"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "»ç¿ëÀÚ°¡ Á¢¼ÓÁßÀÌ ¾Æ´Ô"
 
-#: src/protocols/msn/error.c:68
-msgid "Already in the mode"
-msgstr "ÀÌ¹Ì ÇØ´ç ¸ðµå¿¡ ÀÖÀ½"
-
 #: src/protocols/msn/error.c:71
+msgid "Already in the mode"
+msgstr "ÀÌ¹Ì ÇØ´ç ¸ðµå¿¡ ÀÖÀ½"
+
+#: src/protocols/msn/error.c:74
 msgid "Already in opposite list"
 msgstr "ÀÌ¹Ì ¹Ý´ë ¸ñ·Ï¿¡ ÀÖÀ½"
 
-#: src/protocols/msn/error.c:75
+#: src/protocols/msn/error.c:77
+#, fuzzy
+msgid "Too many groups"
+msgstr "¼¼¼ÇÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
+
+#: src/protocols/msn/error.c:80
+#, fuzzy
+msgid "Invalid group"
+msgstr "À߸øµÈ ±×·ì À̸§"
+
+#: src/protocols/msn/error.c:83
+msgid "User not in group"
+msgstr ""
+
+#: src/protocols/msn/error.c:86
+#, fuzzy
+msgid "Group name too long"
+msgstr "ÇÁ·ÎÆÄÀÏÀÌ ³Ê¹« ±é´Ï´Ù."
+
+#: src/protocols/msn/error.c:89
+msgid "Cannot remove group zero"
+msgstr ""
+
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr ""
 
-#: src/protocols/msn/error.c:79
+#: src/protocols/msn/error.c:97
 msgid "Switchboard failed"
 msgstr "½ºÀ§Ä¡º¸µå ½ÇÆÐ"
 
-#: src/protocols/msn/error.c:82
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr "Àü¼Û ¾Ë¸² ½ÇÆÐ"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:104
 msgid "Required fields missing"
 msgstr "Çʼö Ç׸ñÀÌ ºüÁ³À½"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
+#: src/protocols/msn/error.c:107
+msgid "Too many hits to a FND"
+msgstr ""
+
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "Á¢¼ÓµÇÁö ¾ÊÀ½"
 
-#: src/protocols/msn/error.c:93
-msgid "Internal server error"
-msgstr "³»ºÎ ¼­¹ö ¿À·ù"
-
-#: src/protocols/msn/error.c:96
+#: src/protocols/msn/error.c:114
+#, fuzzy
+msgid "Service Temporarily Unavailable"
+msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/msn/error.c:117
 msgid "Database server error"
 msgstr "µ¥ÀÌÅͺ£À̽º ¼­¹ö ¿À·ù"
 
-#: src/protocols/msn/error.c:99
+#: src/protocols/msn/error.c:120
+#, fuzzy
+msgid "Command disabled"
+msgstr "¸í·É"
+
+#: src/protocols/msn/error.c:123
 msgid "File operation error"
 msgstr "ÆÄÀÏ Ã³¸® ¿À·ù"
 
-#: src/protocols/msn/error.c:102
+#: src/protocols/msn/error.c:126
 msgid "Memory allocation error"
 msgstr "¸Þ¸ð¸® ÇÒ´ç ¿À·ù"
 
-#: src/protocols/msn/error.c:105
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:109
+#: src/protocols/msn/error.c:133
 msgid "Server busy"
 msgstr "¼­¹ö ¹Ù»Ý"
 
-#: src/protocols/msn/error.c:112
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/error.c:115
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr "ÇÇ¾î ¾Ë¸² ¼­¹ö°¡ ´Ù¿îµÊ"
 
-#: src/protocols/msn/error.c:118
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr "µ¥ÀÌÅͺ£À̽º ¿¬°á ¿À·ù"
 
-#: src/protocols/msn/error.c:122
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr "¼­¹ö°¡ °ð ´Ù¿îµÊ"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr "¿¬°áÁß ¿À·ù ¹ß»ý"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:157
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:289
-#: src/protocols/msn/notification.c:757
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "¾µ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:163
 msgid "Session overload"
 msgstr "¼¼¼Ç ºÎÇÏ°¡ ³Ê¹« Å­"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:166
 msgid "User is too active"
 msgstr "»ç¿ëÀÚ°¡ ³Ê¹« È°µ¿ÀûÀÓ"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:169
 msgid "Too many sessions"
 msgstr "¼¼¼ÇÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/protocols/msn/error.c:145
+#: src/protocols/msn/error.c:172
+#, fuzzy
+msgid "Passport not verified"
+msgstr "ÆнºÆ÷Æ® °èÁ¤ÀÌ ¾ÆÁ÷ ÀÎÁõµÇÁö ¾ÊÀ½"
+
+#: src/protocols/msn/error.c:175
+msgid "Bad friend file"
+msgstr "À߸øµÈ Ä£±¸ ÆÄÀÏ"
+
+#: src/protocols/msn/error.c:178
 msgid "Not expected"
 msgstr "¿¹»óÄ¡ ¸øÇÔ"
 
-#: src/protocols/msn/error.c:148
-msgid "Bad friend file"
-msgstr "À߸øµÈ Ä£±¸ ÆÄÀÏ"
-
-#: src/protocols/msn/error.c:152 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:661
+#: src/protocols/msn/error.c:183
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#: src/protocols/msn/error.c:192
+#, fuzzy
+msgid "Server too busy"
+msgstr "¼­¹ö ¹Ù»Ý"
+
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "ÀÎÁõ ½ÇÆÐ."
 
-#: src/protocols/msn/error.c:155
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr "¿ÀÇÁ¶óÀÎÀÏ ¶§ Çã¿ë ¾ÈÇÔ"
 
-#: src/protocols/msn/error.c:158
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr "»õ·Î¿î »ç¿ëÀÚ¸¦ Çã¿ëÇÏÁö ¾ÊÀ½"
 
-#: src/protocols/msn/error.c:162
+#: src/protocols/msn/error.c:211
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr "ÆнºÆ÷Æ® °èÁ¤ÀÌ ¾ÆÁ÷ ÀÎÁõµÇÁö ¾ÊÀ½"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:218
+#, fuzzy
+msgid "Bad ticket"
+msgstr "Ä£±¸ Ç¥½Ã±â"
+
+#: src/protocols/msn/error.c:222
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯ ÄÚµå %d"
 
-#: src/protocols/msn/msn.c:61
+#: src/protocols/msn/error.c:234
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN ¿À·ù: %s\n"
+
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr "»õ·Î¿î MSN ´ëÈ­¸íÀÌ ³Ê¹« ±é´Ï´Ù."
 
-#: src/protocols/msn/msn.c:168
+#: src/protocols/msn/msn.c:191
 msgid "Set your friendly name."
 msgstr "´ëÈ­¸í ÀÔ·ÂÇϼ¼¿ä."
 
-#: src/protocols/msn/msn.c:169
+#: src/protocols/msn/msn.c:192
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "ÀÌ°ÍÀº ´Ù¸¥ MSN Ä£±¸µé¿¡°Ô º¸¿©Áö´Â À̸§ÀÔ´Ï´Ù."
 
-#: src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:204
 msgid "Set your home phone number."
 msgstr "Áý ÀüÈ­¹øÈ£¸¦ ³ÖÀ¸½Ê½Ã¿À."
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "Á÷Àå ÀüÈ­¹øÈ£¸¦ ³ÖÀ¸½Ê½Ã¿À."
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:226
 msgid "Set your mobile phone number."
 msgstr "ÇÚµåÆù ¹øÈ£¸¦ ³ÖÀ¸½Ê½Ã¿À."
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN È£ÃâÀ» Çã¿ëÇÒ±î¿ä?"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:236
 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?"
@@ -5021,172 +6348,193 @@
 "³» Ä£±¸ ¸ñ·ÏÀÇ »ç¶÷µéÀÌ ÇÚµåÆùÀ̳ª ´Ù¸¥ ¸ð¹ÙÀÏ ±â±â·Î MSN È£ÃâÀ» º¸³»µµ·Ï Çã"
 "¿ëÇÏ°Ú½À´Ï±î?"
 
-#: src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr "Çã¿ë"
 
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr "ºÒ°¡"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:258
 msgid "Send a mobile message."
 msgstr "¹®ÀÚ ¸Þ½ÃÁö¸¦ º¸³À´Ï´Ù."
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:260
 msgid "Page"
 msgstr "ÆäÀÌÁö"
 
-#: 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:339 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "ÀÚ¸®ºñ¿ò"
 
-#: 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
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "°ð µ¹¾Æ¿È"
 
-#: 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
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "´Ù¸¥ ¿ë¹« Áß"
 
-#: 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
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "ÅëÈ­ Áß"
 
-#: 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
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "¹ä¸ÔÀ¸·¯ °¨"
 
-#: src/protocols/msn/msn.c:344 src/protocols/msn/msn.c:604
-#: src/protocols/zephyr/zephyr.c:861 src/protocols/zephyr/zephyr.c:876
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "¼û±è"
 
-#: src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:378
 msgid "Set Friendly Name"
 msgstr "´ëÈ­¸í ÀÔ·Â"
 
-#: src/protocols/msn/msn.c:364
+#: src/protocols/msn/msn.c:386
 msgid "Set Home Phone Number"
 msgstr "Áý ÀüÈ­¹øÈ£ ÀÔ·Â"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:392
 msgid "Set Work Phone Number"
 msgstr "Á÷Àå ÀüÈ­¹øÈ£ ÀÔ·Â"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:398
 msgid "Set Mobile Phone Number"
 msgstr "ÇÚµåÆù ¹øÈ£ ¼³Á¤"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:407
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr "È£Ãâ Çã¿ë/ºÒ°¡"
 
-#: src/protocols/msn/msn.c:415
+#: src/protocols/msn/msn.c:440
 msgid "Send to Mobile"
 msgstr "ÇÚµåÆùÀ¸·Î º¸³»±â"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:449
 msgid "Initiate Chat"
 msgstr "äÆà ½ÃÀÛ"
 
-#: 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:702 src/protocols/msn/msn.c:742
-msgid "Invalid MSN screenname"
+#: src/protocols/msn/msn.c:473
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+
+#: src/protocols/msn/msn.c:785
+#, c-format
+msgid ""
+"An MSN screen name 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:789 src/protocols/msn/msn.c:829
+#, fuzzy
+msgid "Invalid MSN screen name"
 msgstr "À߸øµÈ MSN ¾ÆÀ̵ð"
 
-#: 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:1170 src/protocols/yahoo/yahoo.c:1408
+#: src/protocols/msn/msn.c:825
+#, c-format
+msgid ""
+"An MSN screen name 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:1332 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: 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
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "³ªÀÌ"
 
 #. Gender
-#: 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
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "¼ºº°"
 
-#: src/protocols/msn/msn.c:1226 src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "°áÈ¥¿©ºÎ"
 
-#: src/protocols/msn/msn.c:1230 src/protocols/yahoo/yahoo.c:1486
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "À§Ä¡"
 
-#: src/protocols/msn/msn.c:1234 src/protocols/yahoo/yahoo.c:1502
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "Á÷¾÷"
 
-#: 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
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr "¼Ò°³"
 
-#: src/protocols/msn/msn.c:1256 src/protocols/msn/msn.c:1260
-#: src/protocols/msn/msn.c:1262
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr "ÁÁ¾ÆÇÏ´Â °Í"
 
-#: src/protocols/msn/msn.c:1266 src/protocols/msn/msn.c:1268
-#: src/protocols/msn/msn.c:1270
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr "Ãë¹Ì/Èï¹Ì"
 
-#: src/protocols/msn/msn.c:1274 src/protocols/msn/msn.c:1276
-#: src/protocols/yahoo/yahoo.c:1522
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "ÁÁ¾ÆÇÏ´Â ¹®±¸"
 
-#: src/protocols/msn/msn.c:1280 src/protocols/yahoo/yahoo.c:1551
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "ÃÖÁ¾ °»½Å"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1285 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "ȨÆäÀÌÁö"
 
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#, fuzzy, c-format
+msgid "User information for %s unavailable"
+msgstr "%s´ÔÀÇ »ç¿ëÀÚ Á¤º¸¸¦ °¡Á®¿Ã ¼ö ¾øÀ½:"
+
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+msgid "The user's profile is empty."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5197,54 +6545,84 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1371 src/protocols/msn/msn.c:1373
+#. *  description
+#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
 msgid "MSN Protocol Plugin"
 msgstr "MSN ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/msn/msn.c:1390 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "·Î±×ÀÎ ¼­¹ö"
 
-#: src/protocols/msn/notification.c:194
-#, c-format
-msgid "MSN Error: %s\n"
-msgstr "MSN ¿À·ù: %s\n"
-
-#: src/protocols/msn/notification.c:294 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/msn.c:1746
+msgid "Use HTTP Method"
+msgstr ""
+
+#: src/protocols/msn/nexus.c:56
+#, fuzzy
+msgid "Unable to connect to server"
+msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
+#, fuzzy
+msgid "Unable to write to MSN Nexus server."
+msgstr "¼­¹ö¿¡ µ¥ÀÌÅ͸¦ º¸³¾ ¼ö ¾øÀ½"
+
+#: src/protocols/msn/nexus.c:147
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr ""
+
+#: src/protocols/msn/nexus.c:204
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr ""
+
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Ä£±¸ ¸ñ·Ï º¯È¯"
 
-#: src/protocols/msn/notification.c:320
-msgid "Unable to send password"
-msgstr "ºñ¹Ð¹øÈ£¸¦ º¸³¾ ¼ö ¾øÀ½"
-
-#: src/protocols/msn/notification.c:325
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1646
 msgid "Password sent"
 msgstr "ºñ¹Ð¹øÈ£ º¸³¿"
 
-#: src/protocols/msn/notification.c:343
+#: src/protocols/msn/notification.c:361
+msgid "Unable to send password"
+msgstr "ºñ¹Ð¹øÈ£¸¦ º¸³¾ ¼ö ¾øÀ½"
+
+#: src/protocols/msn/notification.c:397
+msgid "Protocol not supported"
+msgstr "Áö¿øÇÏÁö ¾Ê´Â ÇÁ·ÎÅäÄÝ"
+
+#: src/protocols/msn/notification.c:440
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "´Ù¸¥ °÷¿¡¼­ °°Àº ¾ÆÀ̵ð·Î ·Î±×ÀÎÇÏ¿© ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
-#: src/protocols/msn/notification.c:348
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "¿¬°á Á¾·áµÇ¾ú½À´Ï´Ù. MSN ¼­¹ö°¡ ÀϽÃÀûÀ¸·Î ¸ÔÅëÀÌ µÇ¾ú½À´Ï´Ù."
 
-#: src/protocols/msn/notification.c:459
+#: src/protocols/msn/notification.c:584
 #, 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:738
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "%s(%s)´ÔÀÌ ³ª¸¦ Ä£±¸ ¸ñ·Ï¿¡ µî·ÏÇÏ·Á°í ÇÕ´Ï´Ù"
 
-#: src/protocols/msn/notification.c:1207
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1607
 msgid "Unable to transfer to notification server"
 msgstr "Notification ¼­¹ö¿¡ Àü¼ÛÇÒ ¼ö ¾øÀ½"
 
-#: src/protocols/msn/notification.c:1345
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5263,26 +6641,35 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/switchboard.c:122
+#: src/protocols/msn/servconn.c:389
+#, fuzzy
+msgid "IO Error."
+msgstr "¿À·ù"
+
+#: src/protocols/msn/servconn.c:527
+msgid "Received HTTP error. Please report this."
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:150
 msgid "The conversation has become inactive and timed out."
 msgstr "´ëÈ­°¡ ºñÈ°¼ºÈ­µÇ¾ú°Å³ª ½Ã°£ÀÌ ³Ê¹« Áö³µ½À´Ï´Ù."
 
-#: src/protocols/msn/switchboard.c:129
+#: src/protocols/msn/switchboard.c:159
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s´ÔÀÌ ´ëȭâÀ» ´Ý¾Ò½À´Ï´Ù."
 
-#: src/protocols/msn/switchboard.c:251
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr "MSN ¸Þ½ÃÁö¸¦ ¹ÞÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "¼­¹ö¿¡¼­ Çì´õ¸¦ ÀÐÀ» ¼ö ¾øÀ½"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:242
+#, fuzzy, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "¼­¹ö¿¡¼­ ¸Þ½ÃÁö¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù.  ¸í·ÉÀº %hdÀÚ, ±æÀÌ´Â %hdÀÚÀÔ´Ï´Ù."
 
 #: src/protocols/napster/napster.c:307
@@ -5301,27 +6688,219 @@
 msgstr "¼­¹ö¿Í ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s´ÔÀÌ ³» Á¤º¸¸¦ ¿äûÇßÀ½"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "´Ù¸¥ °÷¿¡¼­ °°Àº ¾ÆÀ̵ð·Î ·Î±×ÀÎÇÏ¿© ¿¬°áÀÌ ²÷±è"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5200
-#: src/protocols/toc/toc.c:1236
-msgid "Join what group:"
-msgstr "Âü¿©ÇÒ ±×·ì:"
+#: src/protocols/napster/napster.c:541
+msgid "Get Info"
+msgstr "Á¤º¸ º¸±â"
+
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
+#: src/protocols/toc/toc.c:1259
+#, fuzzy
+msgid "_Group:"
+msgstr "±×·ì:"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+msgid "NAPSTER Protocol Plugin"
+msgstr "³À½ºÅÍ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
+
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, fuzzy, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù. ¸Þ½ÃÁö°¡ ³Ê¹« Å®´Ï´Ù."
+
+#: src/protocols/novell/novell.c:371
+#, fuzzy, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "Ä£±¸¸¦ ´õÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, fuzzy, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, fuzzy, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù. ¸Þ½ÃÁö°¡ ³Ê¹« Å®´Ï´Ù."
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+#, fuzzy
+msgid "Error communicating with server. Closing connection."
+msgstr "Gadu-Gadu ¼­¹ö¿¡ ¿¬°á ¿À·ù"
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "»ç¿ëÀÚ(_U)"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "À̸§"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "»ç¿ëÀÚ ¿É¼Ç"
+
+#: src/protocols/novell/novell.c:1084
+#, fuzzy
+msgid "Unable to make SSL connection to server."
+msgstr "¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+#, fuzzy
+msgid "Authenticating..."
+msgstr "ÀÎÁõ È®ÀÎ Áß"
+
+#: src/protocols/novell/novell.c:1162
+#, fuzzy
+msgid "Waiting for response..."
+msgstr "´ë´äÀ» ±â´Ù¸®´Â Áß..."
+
+#: src/protocols/novell/novell.c:1302
+#, fuzzy
+msgid "Invitation to Conversation"
+msgstr "´ëÈ­ ±â·Ï"
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+#, fuzzy
+msgid "Would you like to join the conversation?"
+msgstr "Á¤¸» µ¤¾î ¾µ±î¿ä?"
+
+#: src/protocols/novell/novell.c:1408
+#, fuzzy
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "´Ù¸¥ °÷¿¡¼­ °°Àº ¾ÆÀ̵ð·Î Á¢¼ÓÇØ ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "Â÷´ÜÇÒ »ç¿ëÀÚÀÇ À̸§À» ³ÖÀ¸¼¼¿ä."
+
+#: src/protocols/novell/novell.c:1582
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "¿ÀÇÁ¶óÀÎ"
+
+#: src/protocols/novell/novell.c:2164
+#, fuzzy, c-format
+msgid ""
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr "<B>»óÅÂ:</B> %s<HR>%s"
+
+#: src/protocols/novell/novell.c:2168
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>»óÅÂ:</b> %s"
+
+#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#, fuzzy
+msgid "Appear Offline"
+msgstr "¿ÀÇÁ¶óÀÎ"
 
 #. *< api_version
 #. *< type
@@ -5333,178 +6912,310 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
-msgid "NAPSTER Protocol Plugin"
-msgstr "³À½ºÅÍ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
-
-#: src/protocols/oscar/oscar.c:179
+#. *  description
+#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server address"
+msgstr "°Å¸® ÁÖ¼Ò"
+
+#: src/protocols/novell/novell.c:2432
+#, fuzzy
+msgid "Server port"
+msgstr "¼­¹ö"
+
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "À߸øµÈ ¿À·ù"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:183
 msgid "Invalid SNAC"
 msgstr "À߸øµÈ SNAC"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:182
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Service unavailable"
-msgstr "¼­ºñ½º ºÒ°¡´É"
-
 #: src/protocols/oscar/oscar.c:185
-msgid "Service not defined"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Obsolete SNAC"
+msgid "Rate to client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Not supported by host"
-msgstr ""
+msgid "Service unavailable"
+msgstr "¼­ºñ½º ºÒ°¡´É"
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Not supported by client"
+msgid "Service not defined"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Refused by client"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Reply too big"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Responses lost"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Request denied"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Busted SNAC payload"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Insufficient rights"
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:195
-msgid "In local permit/deny"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Too evil (sender)"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Too evil (receiver)"
+msgid "Insufficient rights"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "User temporarily unavailable"
-msgstr "»ç¿ëÀÚ°¡ ÀϽÃÀûÀ¸·Î ²÷±è"
+msgid "In local permit/deny"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:199
-msgid "No match"
-msgstr "¸ÂÁö ¾ÊÀ½"
+msgid "Too evil (sender)"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "¸ñ·Ï ³Ñħ"
+msgid "Too evil (receiver)"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:201
-msgid "Request ambiguous"
-msgstr ""
+msgid "User temporarily unavailable"
+msgstr "»ç¿ëÀÚ°¡ ÀϽÃÀûÀ¸·Î ²÷±è"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "Queue full"
-msgstr ""
+msgid "No match"
+msgstr "¸ÂÁö ¾ÊÀ½"
 
 #: src/protocols/oscar/oscar.c:203
+msgid "List overflow"
+msgstr "¸ñ·Ï ³Ñħ"
+
+#: src/protocols/oscar/oscar.c:204
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:205
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "À½¼º"
+
+#: src/protocols/oscar/oscar.c:431
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Á÷Á¢ ¿¬°á"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "´ëÈ­"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr "ÆÄÀÏ ¹Þ±â"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "°ÔÀÓ"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "¾ÖµåÀÎ"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "Ä£±¸ ¸ñ·Ï º¸³»±â"
+
+#: src/protocols/oscar/oscar.c:453
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "AP »ç¿ëÀÚ"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Ç㹫ÁÖÀÇÀÚ"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "ICQ ¼­¹ö ¸±·¹ÀÌ"
+
+#: src/protocols/oscar/oscar.c:468
+msgid "Old ICQ UTF8"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Æ®¸±¸®¾È ¾Ïȣȭ"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:483
+#, fuzzy
+msgid "Video Chat"
+msgstr "äÆà ´õÇϱâ"
+
+#: src/protocols/oscar/oscar.c:487
+#, fuzzy
+msgid "iChat AV"
+msgstr "´ëÈ­"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:493
+#, fuzzy
+msgid "Camera"
+msgstr "À̸§"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr "´ëÈ­ÇÒ ¼ö ÀÖÀ½"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+msgid "Not Available"
+msgstr "»ç¿ëÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr "»ç¿ëÇÏ°í ÀÖÀ½"
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:590
+#, fuzzy
+msgid "Capabilities"
+msgstr "Ŭ¶óÀ̾ðÆ® ±â´É: "
+
+#: src/protocols/oscar/oscar.c:596
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s¿ÍÀÇ Á÷Á¢ ¿¬°áÀÌ ²÷°å½À´Ï´Ù"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:718
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%s¿ÍÀÇ Á÷Á¢ ¿¬°á¿¡ ½ÇÆÐÇß½À´Ï´Ù"
 
-#: 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:548 src/protocols/toc/toc.c:887
+#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ´ëÈ­½Ç°úÀÇ ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:564
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr "Áö±ÝÀº äÆÃÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:638 src/protocols/oscar/oscar.c:695
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 msgid "Couldn't connect to host"
 msgstr "È£½ºÆ®¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:680
+#: src/protocols/oscar/oscar.c:886
+#, fuzzy
+msgid "Screen name sent"
+msgstr "¾ÆÀ̵ð:"
+
+#: src/protocols/oscar/oscar.c:900
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:928
 msgid "Unable to login to AIM"
 msgstr "AIM¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:1040
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÑ ÈÄ ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
-#: 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:864
+#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgid "Unable to establish file descriptor."
+msgstr "ÆÄÀÏ ±â¼úÀÚ°¡ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: src/protocols/oscar/oscar.c:1158
+msgid "Unable to create new connection."
+msgstr "»õ ¿¬°áÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/oscar/oscar.c:1229
 msgid "Unable to establish listener socket."
 msgstr "¸®½º³Ê ¼ÒÄÏÀÌ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:877
-msgid "Unable to establish file descriptor."
-msgstr "ÆÄÀÏ ±â¼úÀÚ°¡ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù."
-
-#: src/protocols/oscar/oscar.c:882
-msgid "Unable to create new connection."
-msgstr "»õ ¿¬°áÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù."
-
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:573
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "¾ÆÀ̵𳪠Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "°èÁ¤ÀÌ ÇöÀç »ç¿ë À¯º¸ »óÅÂÀÔ´Ï´Ù."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ¸Þ½ÅÀú ¼­ºñ½º°¡ Àá½Ã »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1348
 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."
@@ -5512,94 +7223,101 @@
 "³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°í ÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó "
 "½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "»ç¿ëÇÏ°í Àִ Ŭ¶óÀ̾ðÆ®°¡ ³Ê¹« ¿À·¡µÇ¾ú½À´Ï´Ù. ´ÙÀ½ À§Ä¡¿¡¼­ ¾÷±×·¹À̵åÇϽÊ"
 "½Ã¿À. %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "³»ºÎ ¿À·ù"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1457
+#, fuzzy
+msgid "Received authorization"
+msgstr "ÀÎÁõ Àç¿äû"
+
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
 #, 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:1218 src/protocols/oscar/oscar.c:1248
-msgid "Gaim was Unable to get a valid AIM login hash."
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#, fuzzy
+msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "°ÔÀÓÀÌ À¯È¿ÇÑ AIM ·Î±×ÀÎ Çؽø¦ ¾ò¾î¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:1336
-msgid "Gaim was Unable to get a valid login hash."
+#: src/protocols/oscar/oscar.c:1614
+#, fuzzy
+msgid "Gaim was unable to get a valid login hash."
 msgstr "°ÔÀÓÀÌ À¯È¿ÇÑ ·Î±×ÀÎ Çؽø¦ ¾ò¾î¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5591
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s¿Í Á÷Á¢ ¿¬°áµÊ"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2713
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2716
 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:2418 src/protocols/oscar/oscar.c:5752
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 msgid "Connect"
 msgstr "¿¬°á"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2750
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "³»°¡ Ä£±¸ ¸ñ·Ï¿¡ ´ç½ÅÀ» ´õÇÏ·Á°í ÇÕ´Ï´Ù. ÀÎÁõ ¹Ù¶ø´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2758
 msgid "Authorization Request Message:"
 msgstr "ÀÎÁõ ¿äû ¸Þ½ÃÁö:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr "³ª¸¦ ÀÎÁõÇØÁÖ¼¼¿ä!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2788
 #, 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:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 msgid "Request Authorization"
 msgstr "ÀÎÁõ ¿äû"
 
-#: 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
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr "ÀÌÀ¯¸¦ ÀÔ·ÂÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2839
 msgid "Authorization Denied Message:"
 msgstr "ÀÎÁõ °ÅÀý ¸Þ½ÃÁö:"
 
-#: src/protocols/oscar/oscar.c:2606
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5608,31 +7326,31 @@
 "%u »ç¿ëÀÚ°¡ ´ÙÀ½ ÀÌÀ¯·Î ³ª¸¦ ÀÚ½ÅÀÇ Ä£±¸ ¸ñ·Ï¿¡ µî·ÏÇÏ·Á°í ÇÔ:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5127
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 msgid "Authorization Request"
 msgstr "ÀÎÁõ ¿äû"
 
-#: src/protocols/oscar/oscar.c:2626
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+#: src/protocols/oscar/oscar.c:2942
+#, fuzzy, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "%u »ç¿ëÀÚ°¡ Ä£±¸ µî·Ï ¿äûÀ» ´ÙÀ½°ú °°Àº ÀÌÀ¯·Î °ÅÀýÇß½À´Ï´Ù: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2943
 msgid "ICQ authorization denied."
 msgstr "ICQ ÀÎÁõÀÌ °ÅºÎµÇ¾ú½À´Ï´Ù."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "The user %u has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:2950
+#, 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:2642
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5645,7 +7363,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2650
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5658,7 +7376,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2658
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5671,32 +7389,33 @@
 "³»¿ë:\n"
 "%s"
 
-#: 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?"
+#: src/protocols/oscar/oscar.c:2995
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3001
+#, fuzzy
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "³» Ä£±¸ ¸ñ·Ï¿¡ ÀÌ ¿¬¶ôó¸¦ ´õÇÒ±î¿ä?"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:3005
 msgid "Decline"
 msgstr "¿¬°á ²÷±è"
 
-#: src/protocols/oscar/oscar.c:2771
+#: src/protocols/oscar/oscar.c:3090
 #, 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:2780
+#: src/protocols/oscar/oscar.c:3099
 #, 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:2789
+#: src/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5704,194 +7423,79 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:3117
 #, 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:2807
+#: src/protocols/oscar/oscar.c:3126
 #, 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:2816
+#: src/protocols/oscar/oscar.c:3135
 #, 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:2832 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:5879
-msgid "Free For Chat"
-msgstr "´ëÈ­ÇÒ ¼ö ÀÖÀ½"
-
-#: 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:2838 src/protocols/oscar/oscar.c:4591
-#: src/protocols/oscar/oscar.c:5878
-msgid "Occupied"
-msgstr "»ç¿ëÇÏ°í ÀÖÀ½"
-
-#: src/protocols/oscar/oscar.c:2842
-msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:3189
 #, 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:2904
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>»óÅÂ:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2963
+#: src/protocols/oscar/oscar.c:3248
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ¿À·ù: %s\n"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:3249
 msgid "Unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "¸Þ½ÃÁö°¡ %s´Ô¿¡°Ô º¸³»ÁöÁö ¸øÇßÀ½:"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3343
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s´ÔÀÇ »ç¿ëÀÚ Á¤º¸¸¦ °¡Á®¿Ã ¼ö ¾øÀ½:"
 
-#: src/protocols/oscar/oscar.c:3088
-msgid "Voice"
-msgstr "À½¼º"
-
-#: src/protocols/oscar/oscar.c:3091 src/protocols/oscar/oscar.c:5908
-msgid "Direct IM"
-msgstr "Á÷Á¢ ¿¬°á"
-
-#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5924
-msgid "Get File"
-msgstr "ÆÄÀÏ ¹Þ±â"
-
-#: src/protocols/oscar/oscar.c:3100 src/protocols/oscar/oscar.c:5916
-msgid "Send File"
-msgstr "ÆÄÀÏ º¸³»±â"
-
-#: src/protocols/oscar/oscar.c:3104
-msgid "Games"
-msgstr "°ÔÀÓ"
-
-#: src/protocols/oscar/oscar.c:3107
-msgid "Add-Ins"
-msgstr "¾ÖµåÀÎ"
-
-#: src/protocols/oscar/oscar.c:3110
-msgid "Send Buddy List"
-msgstr "Ä£±¸ ¸ñ·Ï º¸³»±â"
-
-#: 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:3119
-msgid "ICQ RTF"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3122
-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 "Member Since : <b>%s</b><br>\n"
-msgstr "<b>»ç¿ëÀÚ:</b> %s<br>"
-
-#: 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 "ÀÚ¸®ºñ¿ò: <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
+#: src/protocols/oscar/oscar.c:3366
+#, fuzzy
+msgid "Warning Level"
+msgstr "°æ°í ¼öÁØ º¸¿©ÁÖ±â(_W)"
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "¿¬°á ½Ã±â"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr "°¡ÀԽñâ"
+
+#: src/protocols/oscar/oscar.c:3455
 msgid "Your AIM connection may be lost."
 msgstr "AIM Á¢¼ÓÀÌ ²÷¾îÁø °Í °°½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:3660
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3641
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3859
 msgid "Rate limiting error."
 msgstr "Á¦ÇÑ ÇÑ°è ¿À·ù."
 
-#: src/protocols/oscar/oscar.c:3661
+#: src/protocols/oscar/oscar.c:3860
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -5899,176 +7503,191 @@
 "Áö³­ ¾×¼ÇÀÌ Á¦ÇÑ ÇѰ踦 ³Ñ¾î¼­ º¸³»ÁöÁö ¾Ê¾Ò½À´Ï´Ù. 10ÃÊ ÈÄ¿¡ ´Ù½Ã ½ÃµµÇϽʽÃ"
 "¿À."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3923
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "´Ù¸¥ °÷¿¡¼­ °°Àº ¾ÆÀ̵ð·Î Á¢¼ÓÇØ ¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3925
 msgid "You have been signed off for an unknown reason."
 msgstr "¾Ë ¼ö ¾ø´Â ÀÌÀ¯·Î Á¢¼ÓÀÌ ²÷¾îÁ³½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3956
+#, fuzzy
+msgid "Finalizing connection"
+msgstr "¿¬°áÁß ¿À·ù ¹ß»ý"
+
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 msgid "Email Address"
 msgstr "¸ÞÀÏ ÁÖ¼Ò"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:4238
 msgid "Mobile Phone"
 msgstr "ÇÚµåÆù"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "¿©¼º"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "³²¼º"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:4255
 msgid "Personal Web Page"
 msgstr "ȨÆäÀÌÁö"
 
-#: src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:4259
 msgid "Additional Information"
 msgstr "Ãß°¡Á¤º¸"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4264
 msgid "Home Address"
 msgstr "Áý ÁÖ¼Ò"
 
-#: 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
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr "¿ìÆí¹øÈ£"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4272
 msgid "Work Address"
 msgstr "Á÷Àå ÁÖ¼Ò"
 
-#: src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4280
 msgid "Work Information"
 msgstr "Á÷Àå Á¤º¸"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4281
 msgid "Company"
 msgstr "ȸ»ç"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr "ÆÄÆ®"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4283
 msgid "Position"
 msgstr "Á÷À§"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:4285
 msgid "Web Page"
 msgstr "ȨÆäÀÌÁö"
 
-#: 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
+#: src/protocols/oscar/oscar.c:4291
+#, fuzzy, c-format
+msgid "ICQ Info for %s"
+msgstr "%sÀÇ Á¤º¸ ¹Ù²Ù±â:"
+
+#: src/protocols/oscar/oscar.c:4341
+#, fuzzy
+msgid "Pop-Up Message"
+msgstr "»õ ¸Þ½ÃÁö"
+
+#: src/protocols/oscar/oscar.c:4362
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4366
+msgid "Search Results"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr "%s ÁּҷΠãÀº °á°ú°¡ ¾øÀ½"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4153
+#: src/protocols/oscar/oscar.c:4406
 msgid "Account Confirmation Requested"
 msgstr "°èÁ¤ È®ÀÎ ¿äû"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4434
 msgid "Error Changing Account Info"
 msgstr "°èÁ¤ Á¤º¸ º¯°æ Áß ¿À·ù"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4437
 #, 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:4187
+#: src/protocols/oscar/oscar.c:4440
 #, 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:4190
+#: src/protocols/oscar/oscar.c:4443
 #, 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:4193
+#: src/protocols/oscar/oscar.c:4446
 #, 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:4196
+#: src/protocols/oscar/oscar.c:4449
 #, 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:4199
+#: src/protocols/oscar/oscar.c:4452
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4213 src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 msgid "Account Info"
 msgstr "°èÁ¤ Á¤º¸"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4686
 msgid "Unable to set AIM profile."
 msgstr "AIM ÇÁ·ÎÇÊÀ» ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:4687
 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:4484
+#: src/protocols/oscar/oscar.c:4714
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6079,22 +7698,27 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:4719
 msgid "Profile too long."
 msgstr "ÇÁ·ÎÆÄÀÏÀÌ ³Ê¹« ±é´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#, fuzzy
+msgid "Visible"
+msgstr "º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
+
+#: src/protocols/oscar/oscar.c:4753
 msgid "Unable to set AIM away message."
 msgstr "AIM ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö¸¦ ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4754
 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:4549
+#: src/protocols/oscar/oscar.c:4794
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6105,27 +7729,41 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:4799
 msgid "Away message too long."
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö°¡ ³Ê¹« ±é´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4892
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
+msgid "Unable To Add"
+msgstr "´õÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/oscar/oscar.c:5029
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ä£±¸¸ñ·ÏÀ» ¹ÞÀ» ¼ö ¾øÀ½"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:5030
 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:4866 src/protocols/oscar/oscar.c:4867
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr "°í¾Æ"
 
-#: src/protocols/oscar/oscar.c:5034
+#: src/protocols/oscar/oscar.c:5309
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6134,15 +7772,11 @@
 "³» Ä£±¸ ¸ñ·Ï¿¡ ³Ê¹« ¸¹Àº Ä£±¸µéÀÌ À־ %s´ÔÀ» ´õÇÒ ¼ö ¾ø½À´Ï´Ù. Çϳª¸¦ Áö¿ì"
 "°í ´Ù½Ã ½ÃµµÇϼ¼¿ä."
 
-#: src/protocols/oscar/oscar.c:5034 src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5035 src/protocols/oscar/oscar.c:5048
-msgid "Unable To Add"
-msgstr "´õÇÒ ¼ö ¾øÀ½"
-
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6150,7 +7784,7 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5404
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6158,11 +7792,11 @@
 msgstr ""
 "%s´ÔÀÌ ³ª¸¦ ÀÚ½ÅÀÇ Ä£±¸ ¸ñ·Ï¿¡ µî·ÏÇÏ·Á°í ÇÕ´Ï´Ù. ¿ì¸®µµ »ó´ë¸¦ Ãß°¡ÇÒ±î¿ä?"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5410
 msgid "Authorization Given"
 msgstr "ÀÎÁõµÊ"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6172,68 +7806,55 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5163
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5485
+#, 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:5164
+#: src/protocols/oscar/oscar.c:5486
 msgid "Authorization Granted"
 msgstr "ÀÎÁõÀÌ Çã¶ôµÊ"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5167
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+#: src/protocols/oscar/oscar.c:5489
+#, fuzzy, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "%s´ÔÀÌ ´ÙÀ½°ú ÀÌÀ¯·Î Ä£±¸ µî·ÏÀ» °ÅÀýÇß½À´Ï´Ù:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5490
 msgid "Authorization Denied"
 msgstr "ÀÎÁõÀÌ °ÅÀýµÊ"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/toc/toc.c:1241
-msgid "Exchange:"
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#, fuzzy
+msgid "_Exchange:"
 msgstr "±³È¯:"
 
-#: src/protocols/oscar/oscar.c:5427
-msgid "<b>Status:</b> "
-msgstr "<b>»óÅÂ:</b>"
-
-#: src/protocols/oscar/oscar.c:5436
-msgid "<b>Logged In:</b> "
-msgstr "<b>Á¢¼Ó½Ã°£:</b> "
-
-#: src/protocols/oscar/oscar.c:5443
-msgid "<b>Capabilities:</b> "
-msgstr "<b>±â´É:</b>"
-
-#: src/protocols/oscar/oscar.c:5450
-msgid "<b>Available:</b> "
-msgstr "<b>ÀÌ¿ë°¡´É:</b>"
-
-#: src/protocols/oscar/oscar.c:5459
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>»óÅÂ:</b> ÀÎÁõ ¾ÈµÊ"
-
-#: src/protocols/oscar/oscar.c:5493
-msgid "Offline"
-msgstr "¿ÀÇÁ¶óÀÎ"
-
-#: src/protocols/oscar/oscar.c:5732
+#: src/protocols/oscar/oscar.c:5549
+#, fuzzy
+msgid "Invalid chat name specified."
+msgstr "À߸øµÈ °¡µÎ-°¡µÎ UINÀÌ ÁöÁ¤µÊ"
+
+#: src/protocols/oscar/oscar.c:5790
+#, fuzzy
+msgid "Away Message"
+msgstr "ÀÚ¸®ºñ¿ò"
+
+#: src/protocols/oscar/oscar.c:6284
 msgid "Unable to open Direct IM"
 msgstr "´ÙÀÌ·ºÆ® ¸Þ½ÃÁö¸¦ ¿­ ¼ö ¾øÀ½"
 
-#: src/protocols/oscar/oscar.c:5745
+#: src/protocols/oscar/oscar.c:6297
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s´Ô°ú ´ÙÀÌ·ºÆ® ¸Þ½ÃÁö ¿¬°áÀ» ¼±ÅÃÇß½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:5748
+#: src/protocols/oscar/oscar.c:6300
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6241,81 +7862,145 @@
 "ÀÌ°ÍÀº ³» IP ÁÖ¼Ò¸¦ ¾Ë¸®±â ¶§¹®¿¡ ÇÁ¶óÀ̹ö½Ã ¹®Á¦¸¦ ÀÏÀ¸Å³ ¼öµµ ÀÖ½À´Ï´Ù. °è"
 "¼Ó ÇÒ±î¿ä?"
 
-#: src/protocols/oscar/oscar.c:5893
+#: src/protocols/oscar/oscar.c:6485
+#, fuzzy
+msgid "Buddy Comment:"
+msgstr "Ä£±¸ À̸§(_B):"
+
+#: src/protocols/oscar/oscar.c:6501
+#, fuzzy
+msgid "Edit Buddy Comment"
+msgstr "Ä£±¸¾Ë¸² °íÄ¡±â"
+
+#: src/protocols/oscar/oscar.c:6509
 msgid "Get Status Msg"
 msgstr "»óÅ ¸Þ½ÃÁö º¸±â"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:6524
+msgid "Direct IM"
+msgstr "Á÷Á¢ ¿¬°á"
+
+#: src/protocols/oscar/oscar.c:6553
+#, fuzzy
+msgid "Re-request Authorization"
+msgstr "ÀÎÁõ Àç¿äû"
+
+#: src/protocols/oscar/oscar.c:6574
 msgid "The new formatting is invalid."
 msgstr "»õ·Î¿î Æ÷¸ËÀÌ À¯È¿ÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/protocols/oscar/oscar.c:5959
-msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5965
-msgid "New screenname formatting:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:6575
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6581
+#, fuzzy
+msgid "New screen name formatting:"
+msgstr "¾ÆÀ̵𸦠ÀÔ·ÂÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
+
+#: src/protocols/oscar/oscar.c:6630
 msgid "Change Address To:"
 msgstr "¹Ù²Ü ÁÖ¼Ò: "
 
-#: src/protocols/oscar/oscar.c:6028
-msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr "´ÙÀ½ Ä£±¸µéÀÇ ÀÎÁõÀ» ±â´Ù¸®°í ÀÖÀ½:<BR>"
-
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ÀÎÁõÀ» ±â´Ù¸®°í ÀÖÁö ¾ÊÀ½<i>"
 
-#: src/protocols/oscar/oscar.c:6058
-#, c-format
-msgid ""
-"%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
+#: src/protocols/oscar/oscar.c:6677
+#, fuzzy
+msgid "You are awaiting authorization from the following buddies"
+msgstr "´ÙÀ½ Ä£±¸µéÀÇ ÀÎÁõÀ» ±â´Ù¸®°í ÀÖÀ½:<BR>"
+
+#: src/protocols/oscar/oscar.c:6678
+#, fuzzy
+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:6692
+#, fuzzy
+msgid "Find Buddy by E-mail"
+msgstr "À̸ÞÀϷΠģ±¸ ã±â"
+
+#: src/protocols/oscar/oscar.c:6693
+#, fuzzy
+msgid "Search for a buddy by e-mail address"
+msgstr "À̸ÞÀϷΠģ±¸ ã±â"
+
+#: src/protocols/oscar/oscar.c:6694
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6711
 msgid "Available Message:"
 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"
+#: src/protocols/oscar/oscar.c:6712
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6788
+#, fuzzy
+msgid "Set User Info..."
+msgstr "»ç¿ëÀÚ Á¤º¸ ÀÔ·Â"
+
+#: src/protocols/oscar/oscar.c:6795
+#, fuzzy
+msgid "Set User Info (URL)..."
+msgstr "»ç¿ëÀÚ Á¤º¸ ÀÔ·Â"
+
+#: src/protocols/oscar/oscar.c:6803
+#, fuzzy
+msgid "Set Available Message..."
 msgstr "À¯È¿ÇÑ ¸Þ½ÃÁö ¼³Á¤"
 
-#: src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6810
+#, fuzzy
+msgid "Change Password..."
+msgstr "ºñ¹Ð¹øÈ£ ¹Ù²Ù±â"
+
+#: src/protocols/oscar/oscar.c:6817
 msgid "Change Password (URL)"
 msgstr "ºñ¹Ð¹øÈ£ ¹Ù²Ù±â (URL)"
 
-#: src/protocols/oscar/oscar.c:6162
-msgid "Format Screenname"
+#: src/protocols/oscar/oscar.c:6825
+msgid "Configure IM Forwarding (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6836
+#, fuzzy
+msgid "Format Screen Name..."
 msgstr "¾ÆÀ̵ð"
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6842
 msgid "Confirm Account"
 msgstr "°èÁ¤ È®ÀÎ"
 
-#: src/protocols/oscar/oscar.c:6174
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6848
+#, fuzzy
+msgid "Display Currently Registered Address"
 msgstr "ÇöÀç µî·ÏµÈ ÁÖ¼Ò º¸¿©ÁÖ±â"
 
-#: src/protocols/oscar/oscar.c:6180
-msgid "Change Current Registered Address"
+#: src/protocols/oscar/oscar.c:6854
+#, fuzzy
+msgid "Change Currently Registered Address..."
 msgstr "ÇöÀç µî·ÏµÈ ÁÖ¼Ò ¹Ù²Ù±â"
 
-#: src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6863
 msgid "Show Buddies Awaiting Authorization"
 msgstr "ÀÎÁõÀ» ±â´Ù¸®°í Àִ ģ±¸ º¸¿©ÁÖ±â"
 
-#: src/protocols/oscar/oscar.c:6197
-msgid "Search for Buddy by Email"
+#: src/protocols/oscar/oscar.c:6871
+#, fuzzy
+msgid "Search for Buddy by Email..."
+msgstr "À̸ÞÀϷΠģ±¸ ã±â"
+
+#: src/protocols/oscar/oscar.c:6878
+#, fuzzy
+msgid "Search for Buddy by Information"
 msgstr "À̸ÞÀϷΠģ±¸ ã±â"
 
 #. *< api_version
@@ -6328,122 +8013,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
+#. *  description
+#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/oscar/oscar.c:6337
+#: src/protocols/oscar/oscar.c:7021
 msgid "Auth host"
 msgstr "ÀÎÁõ È£½ºÆ®"
 
-#: src/protocols/oscar/oscar.c:6342
+#: src/protocols/oscar/oscar.c:7026
 msgid "Auth port"
 msgstr "ÀÎÁõ Æ÷Æ®"
 
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "%s(À»)¸¦ ã´Â Áß"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s´ÔÀº ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s °æ°í´Â Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s¿¡ äÆà Âü¿©¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s´Ô¿¡°Ô ³Ê¹« ÀÚÁÖ ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s´Ô¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ º¸¿©ÁÙ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s´ÔÀÌ ¸Þ½ÃÁö¸¦ ³Ê¹« ÀÚÁÖ º¸³»¼­ º¸¿©ÁÙ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:546
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:549
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:552
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â°¡ ±ÝÁöµÇ¾î ÀÖ½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:563
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:567
+#: src/protocols/toc/toc.c:565
 msgid "Country not supported."
 msgstr "Áö¿øµÇÁö ¾Ê´Â ±¹°¡ÀÔ´Ï´Ù."
 
-#: src/protocols/toc/toc.c:570
+#: src/protocols/toc/toc.c:568
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ë ºÒ°¡´ÉÇÕ´Ï´Ù."
 
-#: src/protocols/toc/toc.c:579
+#: src/protocols/toc/toc.c:577
 msgid "Your warning level is currently too high to log in."
 msgstr "·Î±×ÀÎÇϱ⿡´Â °æ°í ¼öÁØÀÌ ³Ê¹« ³ô½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:580
 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."
@@ -6451,38 +8137,38 @@
 "³Ê¹« ÀÚÁÖ ¿¬°á°ú Á¾·á¸¦ ¹Ýº¹ÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. "
 "°è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
-#: src/protocols/toc/toc.c:587
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d(ÀÌ)°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸: %s"
 
-#: src/protocols/toc/toc.c:607
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:647
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "´ë´äÀ» ±â´Ù¸®´Â Áß..."
 
-#: src/protocols/toc/toc.c:717
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC°¡ ÀϽÃÁßÁö »óÅ¿¡¼­ ´Ù½Ã ½ÃÀ۵Ǿú½À´Ï´Ù. ÀÌÁ¦ ¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ÀÖ½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:905
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "ºñ¹Ð¹øÈ£¸¦ ¼º°øÀûÀ¸·Î ¹Ù²Ù¾úÀ½"
 
-#: src/protocols/toc/toc.c:909
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC°¡ PAUSE ¸í·ÉÀ» º¸³Â½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:908
 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 "
@@ -6492,43 +8178,43 @@
 "¹«½ÃÇÕ´Ï´Ù. ±×¸®°í ¸¸¾à ¸Þ½ÃÁö¸¦ º¸³»¸é °­Á¦·Î Á¢¼ÓÁ¾·áµÉ ¼ö ÀÖ½À´Ï´Ù. ÀÌ°Í"
 "Àº ÀϽÃÀûÀÎ Çö»óÀÌ´Ï ½Å°æ¾²Áö ¸¶½Ê½Ã¿À."
 
-#: src/protocols/toc/toc.c:1379
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸ º¸±â"
 
-#: src/protocols/toc/toc.c:1503
+#: src/protocols/toc/toc.c:1539
 msgid "Set Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸ ¼³Á¤"
 
-#: src/protocols/toc/toc.c:1626
+#: src/protocols/toc/toc.c:1664
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "%s(À»)¸¦ ¾²±â ¸ðµå·Î ¿­ ¼ö ¾ø½À´Ï´Ù!"
 
-#: src/protocols/toc/toc.c:1662
+#: src/protocols/toc/toc.c:1700
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1707 src/protocols/toc/toc.c:1747
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "Àü¼ÛÀ» À§ÇØ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/toc/toc.c:1871
-msgid "Could not connect for transfer!"
-msgstr "Àü¼ÛÀ» À§ÇØ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù!"
-
-#: src/protocols/toc/toc.c:1904
+#: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "ÆÄÀÏ Çì´õ¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù. ÆÄÀÏ Àü¼ÛÀÌ ¿Ï·áµÇÁö ¾Ê¾ÒÀ» °ÍÀÔ´Ï´Ù."
 
-#: src/protocols/toc/toc.c:2038
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "°ÔÀÓ - »õ À̸§À¸·Î ÀúÀå..."
+
+#: src/protocols/toc/toc.c:2076
 #, 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:2045
+#: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s´ÔÀÌ ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
@@ -6543,95 +8229,88 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2120 src/protocols/toc/toc.c:2122
+#. *  description
+#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "TOC ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/toc/toc.c:2139
+#: src/protocols/toc/toc.c:2187
 msgid "TOC host"
 msgstr "TOC È£½ºÆ®"
 
-#: src/protocols/toc/toc.c:2143
+#: src/protocols/toc/toc.c:2191
 msgid "TOC port"
 msgstr "TOC Æ÷Æ®"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:263
 msgid "Basic Profile"
 msgstr "±âº» ÇÁ·ÎÇÊ"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:294
 msgid "E-Mail Address"
 msgstr "¸ÞÀÏ ÁÖ¼Ò"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:300
 msgid "Profile Information"
 msgstr "°³ÀÎÁ¤º¸"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:306
 msgid "Instant Messagers"
 msgstr "ÀνºÅÏÆ® ¸Þ½ÅÀú"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:310
 msgid "AIM"
 msgstr "¸Þ½ÃÁö"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:314
 msgid "ICQ UIN"
 msgstr ""
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:318
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:322
 msgid "Yahoo"
 msgstr "¾ßÈÄ"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:327
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:344
 msgid "Set your Trepia profile data."
 msgstr "Trepia ÇÁ·ÎÇÊ µ¥ÀÌÅ͸¦ ¼³Á¤ÇÕ´Ï´Ù."
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr "ÇÁ·ÎÇÊ"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "ÇÁ·ÎÇÊ ¼³Á¤"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr "ȨÆäÀÌÁö ¹æ¹®"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "³»ºÎ »ç¿ëÀÚ"
 
-#: src/protocols/trepia/trepia.c:1003
-msgid "Read error"
-msgstr "Àб⠿À·ù"
-
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "¼ÒÄÏÀ» ¸¸µé ¼ö ¾øÀ½"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6642,105 +8321,225 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#. *  description
+#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/yahoo/yahoo.c:586
+#: src/protocols/yahoo/yahoo.c:308
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:747
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! ¸Þ½ÃÁö°¡ Àü´ÞµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/protocols/yahoo/yahoo.c:891
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:800
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:866
+#, fuzzy, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s´ÔÀÌ Ä£±¸ µî·ÏÀ» Çã¶ôÇß½À´Ï´Ù."
+
+#: src/protocols/yahoo/yahoo.c:869
+#, 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:872
+#, fuzzy
+msgid "Add buddy rejected"
+msgstr "Ä£±¸¾Ë¸² ´õÇϱâ(_P)"
+
+#: src/protocols/yahoo/yahoo.c:1599
+#, 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:1602
+#, fuzzy
+msgid "Failed Yahoo! Authentication"
+msgstr "ÀÎÁõ È®ÀÎ Áß"
+
+#: src/protocols/yahoo/yahoo.c:1675
+#, 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:1678
+#, fuzzy
+msgid "Ignore buddy?"
+msgstr "¹«½Ã"
+
+#: src/protocols/yahoo/yahoo.c:1711
+#, fuzzy
+msgid "Invalid username."
+msgstr "À߸øµÈ »ç¿ëÀÚ À̸§"
+
+#: src/protocols/yahoo/yahoo.c:1714
+#, fuzzy
+msgid "Incorrect password."
+msgstr "¾ÆÀ̵𳪠Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
+
+#: src/protocols/yahoo/yahoo.c:1717
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1720
+#, fuzzy, c-format
+msgid "Unknown error number %d."
+msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯ ÄÚµå %d"
+
+#: src/protocols/yahoo/yahoo.c:1777
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1779
+#, fuzzy
+msgid "Could not add buddy to server list"
+msgstr "Ä£±¸ ¸ñ·ÏÀ» ³»º¸³¾ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "ÀÐÀ» ¼ö ¾øÀ½"
 
-#: src/protocols/yahoo/yahoo.c:991
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "¿¬°á ¿À·ù"
 
-#: src/protocols/yahoo/yahoo.c:1053 src/protocols/yahoo/yahoo.c:1263
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "Áý¿¡ ¾øÀ½"
 
-#: src/protocols/yahoo/yahoo.c:1055 src/protocols/yahoo/yahoo.c:1265
-#: src/protocols/yahoo/yahoo.c:1338
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "ÀÚ¸®¿¡ ¾øÀ½"
 
-#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1267
-#: src/protocols/yahoo/yahoo.c:1339
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "»ç¹«½Ç¿¡ ¾øÀ½"
 
-#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1271
-#: src/protocols/yahoo/yahoo.c:1341
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "ÈÞ°¡Áß"
 
-#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1275
-#: src/protocols/yahoo/yahoo.c:1343
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "³î·¯°¬À½"
 
-#: src/protocols/yahoo/yahoo.c:1181
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#, fuzzy
+msgid "Not on server list"
+msgstr "¸ñ·Ï¿¡ ¾øÀ½"
+
+#: src/protocols/yahoo/yahoo.c:2407
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr "<b>»óÅÂ:</b> %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
+#, fuzzy
+msgid "Join in Chat"
+msgstr "äÆà Âü¿©"
+
+#: src/protocols/yahoo/yahoo.c:2449
+#, fuzzy
+msgid "Initiate Conference"
+msgstr "äÆà ½ÃÀÛ"
+
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr "ID¸¦ È°¼ºÈ­ÇÒ±î¿ä?"
 
-#: src/protocols/yahoo/yahoo.c:1192
-msgid "Activate ID"
+#: src/protocols/yahoo/yahoo.c:2510
+#, fuzzy
+msgid "Join who in chat?"
+msgstr "äÆà Âü¿©"
+
+#: src/protocols/yahoo/yahoo.c:2521
+#, fuzzy
+msgid "Activate ID..."
 msgstr "ID È°¼ºÈ­"
 
-#: src/protocols/yahoo/yahoo.c:1420
+#: src/protocols/yahoo/yahoo.c:2527
+#, fuzzy
+msgid "Join user in chat..."
+msgstr "äÆà Âü¿©..."
+
+#: src/protocols/yahoo/yahoo.c:2916
 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:1422 src/protocols/yahoo/yahoo.c:1438
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1436
+"web browser<br>"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2939
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1470
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1512 src/protocols/yahoo/yahoo.c:1514
-#: src/protocols/yahoo/yahoo.c:1516
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1518 src/protocols/yahoo/yahoo.c:1520
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "ÃֽŠ´º½º"
 
-#: src/protocols/yahoo/yahoo.c:1529
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "ȨÆäÀÌÁö"
 
-#: src/protocols/yahoo/yahoo.c:1539
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "¸ÚÁø ¸µÅ© 1"
 
-#: src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "¸ÚÁø ¸µÅ© 2"
 
-#: src/protocols/yahoo/yahoo.c:1543
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "¸ÚÁø ¸µÅ© 3"
 
-#: src/protocols/yahoo/yahoo.c:1547
-msgid "Member Since"
-msgstr "°¡ÀԽñâ"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6751,65 +8550,149 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1638 src/protocols/yahoo/yahoo.c:1640
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "¾ßÈÄ ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/protocols/yahoo/yahoo.c:1657
+#: src/protocols/yahoo/yahoo.c:3314
 msgid "Pager host"
 msgstr "Á¢¼Ó È£½ºÆ®"
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: src/protocols/yahoo/yahoo.c:3317
 msgid "Pager port"
 msgstr "Á¢¼Ó Æ÷Æ®"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/yahoo/yahoo.c:3320
+#, fuzzy
+msgid "File transfer host"
+msgstr "ÆÄÀÏ Àü¼Û"
+
+#: src/protocols/yahoo/yahoo.c:3323
+#, fuzzy
+msgid "File transfer port"
+msgstr "ÆÄÀÏ Àü¼Û Ãë¼Ò"
+
+#: src/protocols/yahoo/yahoo.c:3326
+msgid "Chat Room List Url"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:198
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:200
+#, fuzzy
+msgid "Invitation Rejected"
+msgstr "ÃÊ´ëÀÚ¸¸"
+
+#: src/protocols/yahoo/yahoochat.c:350
+#, fuzzy
+msgid "Failed to join chat"
+msgstr "´ëÈ­¿¡ Âü¿©ÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/yahoo/yahoochat.c:350
+msgid "Maybe the room is full?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:426
+#, fuzzy, c-format
+msgid "You are now chatting in %s."
+msgstr "%s¿¡¼­ ¹êµÇ¾ú½À´Ï´Ù."
+
+#: src/protocols/yahoo/yahoochat.c:580
+#, fuzzy
+msgid "Failed to join buddy in chat"
+msgstr "´ëÈ­¿¡ Âü¿©ÇÒ ¼ö ¾øÀ½"
+
+#: src/protocols/yahoo/yahoochat.c:581
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Unable to connect"
+msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1346
+#, fuzzy
+msgid "Voices"
+msgstr "À½¼º"
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#, fuzzy
+msgid "Unable to fetch room list."
+msgstr "AIM ÇÁ·ÎÇÊÀ» ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: src/protocols/yahoo/yahoochat.c:1414
+#, fuzzy
+msgid "User Rooms"
+msgstr "»ç¿ëÀÚ ¿É¼Ç"
+
+#: src/protocols/zephyr/zephyr.c:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>»ç¿ëÀÚ:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>º°Äª:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:571 src/protocols/zephyr/zephyr.c:572
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "¾Æ¹«³ª"
 
-#: src/protocols/zephyr/zephyr.c:596
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr "ÀÌ¹Ì Zephyr¿¡ ¿¬°áµÊ"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:858
 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:846
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr "ZÀ§Ä¡"
 
-#: src/protocols/zephyr/zephyr.c:886
-msgid "Class:"
+#: src/protocols/zephyr/zephyr.c:1206
+#, fuzzy
+msgid "_Class:"
 msgstr "Ŭ·¡½º:"
 
-#: src/protocols/zephyr/zephyr.c:891
-msgid "Instance:"
+#: src/protocols/zephyr/zephyr.c:1212
+#, fuzzy
+msgid "_Instance:"
 msgstr "ÀνºÅϽº:"
 
-#: src/protocols/zephyr/zephyr.c:896
-msgid "Recipient:"
+#: src/protocols/zephyr/zephyr.c:1218
+#, fuzzy
+msgid "_Recipient:"
 msgstr "¹Þ´Â»ç¶÷:"
 
 #. *< api_version
@@ -6822,91 +8705,121 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1028 src/protocols/zephyr/zephyr.c:1030
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr ÇÁ·ÎÅäÄÝ Ç÷¯±×ÀÎ"
 
-#: src/proxy.c:1680
+#: src/protocols/zephyr/zephyr.c:1392
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1395
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1398
+msgid "Exposure"
+msgstr ""
+
+#. Forbidden
+#: src/proxy.c:955
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:957
+#, fuzzy, c-format
+msgid "Proxy connection error %d"
+msgstr "¿¬°á ¿À·ù"
+
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr "À߸øµÈ ÇÁ·Ï½Ã ¼¼ÆÃ"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1696
 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:185
+#: src/prpl.h:195
 msgid "Custom"
 msgstr "»ç¿ëÀÚÁ¤ÀÇ"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:1250
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:57
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇϼ¼¿ä"
 
-#: src/server.c:934
+#: src/server.c:962
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d ¸Þ½ÃÁö)"
 
-#: src/server.c:947
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 ¸Þ½ÃÁö)"
 
-#: src/server.c:1139 src/server.c:1149
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s´ÔÀÌ Á¢¼ÓÇß½À´Ï´Ù."
 
-#: src/server.c:1168 src/server.c:1176
+#: src/server.c:1184
+#, fuzzy, c-format
+msgid "%s signed on"
+msgstr "%s´ÔÀÌ ¿¬°áµÊ"
+
+#: src/server.c:1200
+#, fuzzy, c-format
+msgid "%s came back"
+msgstr "+++ %s (%s) µ¹¾Æ¿È @ %s"
+
+#: src/server.c:1202
+#, fuzzy, c-format
+msgid "%s went away"
+msgstr "%s´ÔÀÌ ÀÚ¸®¸¦ ºñ¿ü½À´Ï´Ù."
+
+#: src/server.c:1217
+#, fuzzy, c-format
+msgid "%s became idle"
+msgstr "%s´ÔÀÌ »ç¿ë¾ÈÇÔ »óÅ°¡ µÊ"
+
+#: src/server.c:1231
+#, fuzzy, c-format
+msgid "%s became unidle"
+msgstr "%s´ÔÀÌ »ç¿ë¾ÈÇÔ »óÅ°¡ µÊ"
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s´ÔÀÌ Á¢¼ÓÀ» ²÷¾ú½À´Ï´Ù."
 
-#: src/server.c:1225
+#: src/server.c:1267
+#, fuzzy, c-format
+msgid "%s signed off"
+msgstr "%s´ÔÀÇ ¿¬°áÀÌ ²÷±è"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1228
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "ÀÍ¸í »ç¿ëÀÚ"
 
-#: src/server.c:1323
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6915,57 +8828,361 @@
 "'%s'´ÔÀÌ %s´ÔÀ» ´ëÈ­½Ç¿¡ ÃÊ´ë: '%s'\n"
 "%s"
 
-#: src/server.c:1327
+#: src/server.c:1434
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "'%s'´ÔÀÌ %s´ÔÀ» ´ëÈ­½Ç¿¡ ÃÊ´ë: '%s'\n"
 
-#: src/server.c:1333
+#: src/server.c:1440
 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 ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr ""
 
-#: src/stock.c:84
+#: src/stock.c:86
+msgid "_Alias"
+msgstr "º°Äª(_A)"
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "°íÄ¡±â(_S)"
 
-#: src/stock.c:85
+#: src/stock.c:89
 msgid "_Open Mail"
 msgstr "ÆíÁö ¿­±â(_O)"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/stock.c:91
+msgid "_Warn"
+msgstr "°æ°í(_W)"
+
+#: src/util.c:2040
+msgid "Calculating..."
+msgstr "°è»êÁß..."
+
+#: src/util.c:2043
+msgid "Unknown."
+msgstr "¾Ë·ÁÁöÁö ¾ÊÀ½."
+
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ÀÏ"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "½Ã°£"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ºÐ"
 
-#: src/util.c:934
-msgid "Calculating..."
-msgstr "°è»êÁß..."
-
-#: src/util.c:937
-msgid "Unknown."
-msgstr "¾Ë·ÁÁöÁö ¾ÊÀ½."
+#: src/util.c:2430
+msgid "g003: Error opening connection.\n"
+msgstr "g003: ¿¬°áÁß ¿¡·¯ ¹ß»ý.\n"
+
+#: src/win32/win32dep.c:272
+msgid "Moving Gaim Settings.."
+msgstr ""
+
+#: src/win32/win32dep.c:275
+msgid "Moving Gaim user settings to: "
+msgstr ""
+
+#: src/win32/win32dep.c:277
+#, fuzzy
+msgid "Notification"
+msgstr "ŸÀÌÇÎ ¾Ë¸²"
+
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "±×³ð Áõ±Ç ½Ã¼¼ Ç¥½Ã±â ȯ°æ ¼³Á¤"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "¾÷µ¥ÀÌÆ® °£°Ý(ºÐ´ÜÀ§)"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "¾Æ·¡ÀÇ »óÀÚ¿¡ ±âÈ£¸¦ \"+\"·Î ±¸ºÐÇÏ¿© ÀÔ·ÂÇϼ¼¿ä."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "±âÈ£¿Í °¡°Ý¸¸ º¸¿©ÁÖ±â:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î ½ºÅ©·Ñ:"
+
+#~ msgid "(No"
+#~ msgstr "(Ãë¼Ò"
+
+#~ msgid "Change"
+#~ msgstr "¹Ù²Ù±â"
+
+#~ msgid "_Quote window title"
+#~ msgstr "â Á¦¸ñ Àοë(_Q)"
+
+#~ msgid "_Notify even if conversation is in focus"
+#~ msgstr "´ëÈ­°¡ È°¼ºÈ­ µÇ¸é ¾Ë¸²(_N)"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "°ÔÀÓ - ÀÚ¸®ºñ¿ò!"
+
+#~ msgid "Converting Buddy List"
+#~ msgstr "Ä£±¸ ¸ñ·Ï º¯È¯"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "äÆÃ"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "äÆà Âü¿©½Ã º°¸í:"
+
+#~ msgid "Join"
+#~ msgstr "Âü¿©"
+
+#~ msgid "_Screenname:"
+#~ msgstr "¾ÆÀ̵ð(_S):"
+
+#~ msgid "Add a new group"
+#~ 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 "Maiden Name"
+#~ msgstr "°áÈ¥ Àü ¼º"
+
+#~ msgid "Find Buddy By Info"
+#~ msgstr "Á¤º¸·Î Ä£±¸ ã±â"
+
+#~ msgid "Alias chat"
+#~ msgstr "äÆà º°Äª"
+
+#~ msgid "Alias buddy"
+#~ msgstr "Ä£±¸ º°Äª"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "³» Ä£±¸ ¸ñ·Ï¿¡¼­ »ç¿ëÇÒ ¾Æ·¡ »ç¿ëÀÚÀÇ º°ÄªÀ» ÀÔ·ÂÇϰųª ÀÌ ¿¬°áÀÇ À̸§À» "
+#~ "¹Ù²Ù¼¼¿ä."
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "%s¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "Save Log File"
+#~ msgstr "·Î±×ÆÄÀÏ ÀúÀå"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "%s ÆÄÀÏÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "Clear Log"
+#~ msgstr "·Î±× ºñ¿ì±â"
+
+#~ msgid "Really clear log?"
+#~ msgstr "Á¤¸»·Î ·Î±×¸¦ Áö¿ï±î¿ä?"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "·Î±× ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "Clear"
+#~ msgstr "Áö¿ì±â"
+
+#~ msgid "Could not open config file %s."
+#~ msgstr "¼³Á¤ ÆÄÀÏ %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "_Get Info"
+#~ msgstr "Á¤º¸ º¸±â(_G)"
+
+#~ msgid "_IM"
+#~ msgstr "¸Þ½ÃÁö(_I)"
+
+#~ msgid "%s has been disconnected"
+#~ msgstr "%sÀÇ ¿¬°áÀÌ ²÷±è"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "°ÔÀÓ - ±×¸² »ðÀÔ"
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/´ëÈ­(C)/_URL ³Ö±â..."
+
+#~ msgid "Normal font size"
+#~ msgstr "±ÛÀÚ Å©±â¸¦ º¸ÅëÀ¸·Î"
+
+#~ msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+#~ msgstr "<HR><BR><H3 Align=Center> ---- %s ´Ô°úÀÇ »õ ´ëÈ­ ----</H3><BR>\n"
+
+#~ msgid "---- New Conversation @ %s ----\n"
+#~ msgstr "---- %s´Ô°úÀÇ »õ ´ëÈ­ ----\n"
+
+#~ msgid "Disable Animation"
+#~ msgstr "¾Ö´Ï¸ÞÀÌ¼Ç ²û"
+
+#~ msgid "Enable Animation"
+#~ msgstr "¾Ö´Ï¸ÞÀÌ¼Ç »ç¿ë"
+
+#~ msgid "_Host"
+#~ msgstr "È£½ºÆ®(_H)"
+
+#~ msgid "Browser Options"
+#~ msgstr "ºê¶ó¿ìÀú ¿É¼Ç"
+
+#~ msgid "Open new _window by default"
+#~ msgstr "»õ âÀ¸·Î ¿­±â¸¦ ±âº»À¸·Î ÇÔ(_W)"
+
+#~ msgid "Strip _HTML from logs"
+#~ msgstr "_HTML ű׸¦ »©°í ±â·Ï"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "Ä£±¸¸¶´Ù º°µµÀÇ ·Î±×ÆÄÀÏ »ç¿ë(_N)"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "°ÔÀÓ - ¾ÆÀÌÄÜ ÀúÀå"
+
+#~ msgid "Error in specifying buddy conversation."
+#~ msgstr "´ëÈ­¸¦ ±â·Ï Áß¿¡ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù."
+
+#~ msgid "Unable to find conversation log"
+#~ msgstr "´ëÈ­ ±â·ÏÀ» ãÀ» ¼ö ¾øÀ½"
+
+#~ msgid "Unable to make directory %s for logging"
+#~ msgstr "Á¢¼ÓÀ» À§ÇØ %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾øÀ½"
+
+#~ msgid "IM Sessions with %s\n"
+#~ msgstr "%s´Ô°úÀÇ ¸Þ½ÅÀú ¼¼¼Ç\n"
+
+#~ msgid "IM Sessions with %s"
+#~ msgstr "%s´Ô°úÀÇ ¸Þ½ÅÀú ¼¼¼Ç"
+
+#~ msgid "+++ %s (%s) signed on @ %s"
+#~ msgstr "+++ %s (%s) ¿¬°á @ %s"
+
+#~ msgid "+++ %s (%s) signed off @ %s"
+#~ msgstr "+++ %s (%s) ¿¬°á ²÷±è @ %s"
+
+#~ msgid "+++ %s (%s) changed away state @ %s"
+#~ msgstr "+++ %s (%s)´ÔÀÇ ÀÚ¸®ºñ¿ò »óÅ ¹Ù²ñ @ %s"
+
+#~ msgid "+++ %s (%s) became idle @ %s"
+#~ msgstr "+++ %s (%s) »ç¿ë¾ÈÇÔ @ %s"
+
+#~ msgid "+++ %s (%s) returned from idle @ %s"
+#~ msgstr "+++ %s (%s) »ç¿ë¾ÈÇÔ¿¡¼­ µ¹¾Æ¿È @ %s"
+
+#~ msgid "+++ Program exit @ %s"
+#~ msgstr "+++ ÇÁ·Î±×·¥ ¸¶Ä§ @ %s"
+
+#~ msgid "<New User>"
+#~ msgstr "<»õ »ç¿ëÀÚ>"
+
+#~ msgid "Disconnected"
+#~ msgstr "²÷¾îÁü"
+
+#~ msgid "Unable to change password."
+#~ msgstr "ºñ¹Ð¹øÈ£¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "Jabber Error %s"
+#~ msgstr "Àç¹ö %s ¿À·ù"
+
+#~ msgid "Unknown login error"
+#~ msgstr "¾Ë ¼ö ¾ø´Â ·Î±ä ¿¡·¯"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "ºñ¹Ð¹øÈ£¸¦ ¼º°øÀûÀ¸·Î ¹Ù²Ù¾ú½À´Ï´Ù."
+
+#~ msgid "Connected"
+#~ msgstr "¿¬°á"
+
+#~ msgid "Requesting Authentication Method"
+#~ msgstr "ÀÎÁõ ¹æ¹ý ¿äû"
+
+#~ msgid "View Error Msg"
+#~ msgstr "¿¡·¯ ¸Þ½ÃÁö º¸±â"
+
+#~ msgid "Error %d: %s"
+#~ msgstr "%d ¿À·ù: %s"
+
+#~ msgid "Unknown registration error"
+#~ msgstr "¾Ë ¼ö ¾ø´Â °¡ÀÔ ¿À·ù"
+
+#~ msgid "Invalid Parameter (probably a Gaim bug)"
+#~ msgstr "À߸øµÈ ÆĶó¸ÞÅÍ (°ÔÀÓÀÇ ¹ö±×ÀÏ ¼ö ÀÖÀ½)"
+
+#~ msgid "Join what group:"
+#~ msgstr "Âü¿©ÇÒ ±×·ì:"
+
+#~ msgid "EveryBuddy Bug"
+#~ msgstr "¿¡ºê¸®¹öµð ¹ö±×"
+
+#~ msgid "ICQ Unknown"
+#~ msgstr "ICQ ¾Ë·ÁÁöÁö ¾ÊÀ½"
+
+#~ msgid "Online Since : <b>%s</b><br>\n"
+#~ msgstr "Á¢¼Ó ½Ã°£ : <b>%s</b><br>\n"
+
+#, fuzzy
+#~ msgid "Member Since : <b>%s</b><br>\n"
+#~ msgstr "<b>»ç¿ëÀÚ:</b> %s<br>"
+
+#~ msgid "Idle : <b>%s</b>"
+#~ msgstr "ÀÚ¸®ºñ¿ò: </b>%s</b>"
+
+#~ msgid "Idle: <b>Active</b>"
+#~ msgstr "ÀÚ¸®ºñ¿ò: <b>È°¼ºÈ­</b>"
+
+#~ 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"
+
+#~ msgid "<i>User has no away message</i>"
+#~ msgstr "<i>ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö°¡ ¾øÀ½</i>"
+
+#~ msgid "<i>No Information Provided</i>"
+#~ msgstr "<i>Á¦°ø Á¤º¸°¡ ¾øÀ½</i>"
+
+#~ msgid "<b>Status:</b> "
+#~ msgstr "<b>»óÅÂ:</b>"
+
+#~ msgid "<b>Capabilities:</b> "
+#~ msgstr "<b>±â´É:</b>"
+
+#~ msgid "<b>Available:</b> "
+#~ msgstr "<b>ÀÌ¿ë°¡´É:</b>"
+
+#~ msgid "<b>Status:</b> Not Authorized"
+#~ msgstr "<b>»óÅÂ:</b> ÀÎÁõ ¾ÈµÊ"
+
+#~ msgid "Please talk to me, I'm lonely! (and single)"
+#~ msgstr "³ª¿Í ¾ê±âÇØÁÖ¼¼¿ä, ³­ ¿Ü·Î¿ö¿ä! (±×¸®°í ½Ì±Û)"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "Àü¼ÛÀ» À§ÇØ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù!"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "°ÔÀÓ - Á¤º¸"
+
+#~ msgid "Gaim - Popup"
+#~ msgstr "°ÔÀÓ - Æ˾÷"
+
+#~ msgid "More Info"
+#~ msgstr "Á¤º¸ º¸±â"