2 files changed, 1758 insertions, 1843 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 9c2e08043a..60d179cce3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-06  Fatih Demir	<kabalak@gmx.net>
+
+	* ko.po: Committed updated Korean translation.
+
 2001-01-06  Jarkko Ranta  <jjranta@cc.joensuu.fi>
 
 	* fi.po: Updated Finnish translation.
diff --git a/po/ko.po b/po/ko.po
index 8e76b3a0ce..4a92ce5870 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,28 +1,30 @@
 # evolution ko.po
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Young-Ho, Cha <ganadist@dacome.co.kr>, 2000.
+# update by Sung-Hyun Nam 2000/09/08
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS20000808\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
-"PO-Revision-Date: 2000-09-08 17:08+0900\n"
-"Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
+"Project-Id-Version: evolution 0.8\n"
+"POT-Creation-Date: 2001-01-06 15:29+0900\n"
+"PO-Revision-Date: 2001-01-06 15:31+0900\n"
+"Last-Translator: Young-Ho, Cha <ganadist@chollian.net\n>"
 "Language-Team: korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/e-card.c:3046
-#, fuzzy
 msgid "Card: "
-msgstr "ÀÚµ¿Â÷"
+msgstr "Ä«µå: "
 
 #: addressbook/backend/ebook/e-card.c:3048
-#, fuzzy
 msgid ""
 "\n"
 "Name: "
-msgstr "À̸§:"
+msgstr ""
+"\n"
+"À̸§: "
 
 #: addressbook/backend/ebook/e-card.c:3049
 msgid ""
@@ -55,18 +57,20 @@ msgid ""
 msgstr ""
 
 #: addressbook/backend/ebook/e-card.c:3067
-#, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
-msgstr "½ÃÀÛ ³¯Â¥(_r):"
+msgstr ""
+"\n"
+"»ýÀÏ: "
 
 #: addressbook/backend/ebook/e-card.c:3078
-#, fuzzy
 msgid ""
 "\n"
 "Address:"
-msgstr "ÁÖ¼Ò:"
+msgstr ""
+"\n"
+"ÁÖ¼Ò:"
 
 #: addressbook/backend/ebook/e-card.c:3080
 msgid ""
@@ -91,24 +95,32 @@ msgid ""
 "\n"
 "  City:        "
 msgstr ""
+"\n"
+"  ½Ã:          "
 
 #: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
+"\n"
+"  Áö¿ª:        "
 
 #: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
+"\n"
+"  ¿ìÆí ¹øÈ£:   "
 
 #: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
+"\n"
+"  ±¹°¡:        "
 
 #: addressbook/backend/ebook/e-card.c:3099
 msgid ""
@@ -121,26 +133,32 @@ msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
+"\n"
+"ÀüÈ­¹øÈ£:\n"
 
 #: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
+"\n"
+"ÀüÈ­¹øÈ£:"
 
 #: addressbook/backend/ebook/e-card.c:3138
-#, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
-msgstr "À̸ÞÀÏ 2"
+msgstr ""
+"\n"
+"ÀüÀÚ¿ìÆí:\n"
 
 #: addressbook/backend/ebook/e-card.c:3141
-#, fuzzy
 msgid ""
 "\n"
 "E-mail:"
-msgstr "À̸ÞÀÏ 2"
+msgstr ""
+"\n"
+"ÀüÀÚ¿ìÆí:"
 
 #: addressbook/backend/ebook/e-card.c:3160
 msgid ""
@@ -153,6 +171,8 @@ msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
+"\n"
+"½Ã°£´ë: "
 
 #: addressbook/backend/ebook/e-card.c:3174
 #, fuzzy
@@ -173,13 +193,16 @@ msgid ""
 "\n"
 "Org: "
 msgstr ""
+"\n"
+"±â°ü: "
 
 #: addressbook/backend/ebook/e-card.c:3191
-#, fuzzy
 msgid ""
 "\n"
 "  Name:  "
-msgstr "À̸§:"
+msgstr ""
+"\n"
+"  À̸§:  "
 
 #: addressbook/backend/ebook/e-card.c:3192
 msgid ""
@@ -217,6 +240,8 @@ msgid ""
 "\n"
 "Comment: "
 msgstr ""
+"\n"
+"ÁÖ¼®:    "
 
 #. if (crd->sound.prop.used) {
 #. if (crd->sound.type != SOUND_PHONETIC)
@@ -239,15 +264,17 @@ msgid ""
 "\n"
 "Public Key: "
 msgstr ""
+"\n"
+"°ø¿ë Å°: "
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
 
@@ -301,7 +328,7 @@ msgstr ""
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
 #: calendar/conduits/todo/todo-conduit-control-applet.c:122
 msgid "Original Author:"
-msgstr ""
+msgstr "¿ø ÀúÀÛÀÚ:"
 
 #: addressbook/conduit/address-conduit-control-applet.c:123
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
@@ -311,7 +338,7 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:127
 msgid "Evolution Addressbook Conduit"
-msgstr ""
+msgstr "Evolution ÁÖ¼Ò·Ï ºÎÇ°"
 
 #: addressbook/conduit/address-conduit-control-applet.c:128
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
@@ -321,7 +348,7 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
+msgstr "Evolution¿ë ÁÖ¼Ò·Ï ºÎÇ° ¼³Á¤ µµ±¸.\n"
 
 #: addressbook/conduit/address-conduit-control-applet.c:131
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
@@ -333,13 +360,13 @@ msgstr ""
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
 #: calendar/conduits/todo/todo-conduit-control-applet.c:162
 msgid "Synchronize Action"
-msgstr ""
+msgstr "µ¿±âÈ­ ½ÇÇà"
 
 #: addressbook/conduit/address-conduit-control-applet.c:214
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
-msgstr ""
+msgstr "ºÎÇ° »óÅÂ"
 
 #: addressbook/conduit/address-conduit-control-applet.c:266
 #: addressbook/conduit/address-conduit-control-applet.c:279
@@ -351,6 +378,8 @@ msgid ""
 "No pilot configured, please choose the\n"
 "'Pilot Link Properties' capplet first."
 msgstr ""
+"¼³Á¤µÈ ÆÄÀÏ·µÀÌ ¾ø½À´Ï´Ù, ¸ÕÀú 'ÆÄÀÏ·µ\n"
+"¿¬°á ¼³Á¤'ijÇø´À» ¼±ÅÃÇϽʽÿÀ."
 
 #: addressbook/conduit/address-conduit-control-applet.c:285
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
@@ -366,51 +395,32 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
-#, fuzzy
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
-msgstr "gnomecal ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+msgstr "wombat ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
-#, fuzzy
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
-msgstr "gnomecal ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+msgstr "wombatÀ» ½ÃÀÛÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr ""
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr ""
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr ""
-
-#.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
@@ -428,7 +438,7 @@ msgid "_Add"
 msgstr "Ãß°¡(_A)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "»èÁ¦(_D)"
 
@@ -446,7 +456,8 @@ msgstr "»õ ÀüÈ­ ÇüÅÂ"
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
+#: po/tmp/filter.glade.h:6 po/tmp/mail-config-druid.glade.h:10
 #: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Ãß°¡"
@@ -488,7 +499,7 @@ msgid "_Mobile"
 msgstr "ÈÞ´ëÀüÈ­(_M)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "À̸ÞÀÏ"
 
@@ -518,12 +529,11 @@ msgid "_Company:"
 msgstr "ȸ»ç(_C):"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:29
-#, fuzzy
 msgid "_Address..."
-msgstr "ÁÖ¼Ò"
+msgstr "ÁÖ¼Ò(_A)..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: po/tmp/event-editor-dialog.glade.h:15 po/tmp/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "ÀÏ¹Ý Á¤º¸"
 
@@ -572,91 +582,91 @@ msgstr "³ëÆ®(_t):"
 msgid "Details"
 msgstr "ÀÚ¼¼È÷"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Á¶¼ö"
 
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "Á÷Àå"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Á÷Àå 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Á÷Àå Æѽº"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "ÀÚµ¿Â÷"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "ȸ»ç"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "Áý"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Áý 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Áý Æѽº"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "ÈÞ´ëÀüÈ­"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
 #: po/tmp/mail-config.glade.h:17
 msgid "Other"
 msgstr "±âŸ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "±âŸ Æѽº"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "ȧȧ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "À̸ÞÀÏ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "À̸ÞÀÏ 3"
 
@@ -665,41 +675,36 @@ msgstr "À̸ÞÀÏ 3"
 #. * DO NOT compile this file as part of your application.
 #.
 #: po/tmp/fulladdr.glade.h:6
-#, fuzzy
 msgid "Address _2:"
-msgstr "ÁÖ¼Ò:"
+msgstr "ÁÖ¼Ò _2:"
 
 #: po/tmp/fulladdr.glade.h:7
 msgid "Canada"
-msgstr ""
+msgstr "ij³ª´Ù"
 
 #: po/tmp/fulladdr.glade.h:8
-#, fuzzy
 msgid "Check Address"
-msgstr "ÁÖ¼Ò"
+msgstr "ÁÖ¼Ò È®ÀÎ"
 
 #: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
-msgstr ""
+msgstr "±¹°¡(_y):"
 
 #: po/tmp/fulladdr.glade.h:10
-#, fuzzy
 msgid "Finland"
-msgstr "ã±â"
+msgstr "Çɶõµå"
 
 #: po/tmp/fulladdr.glade.h:11
 msgid "USA"
-msgstr ""
+msgstr "¹Ì±¹"
 
 #: po/tmp/fulladdr.glade.h:12
-#, fuzzy
 msgid "_Address:"
-msgstr "ÁÖ¼Ò:"
+msgstr "ÁÖ¼Ò(_A):"
 
 #: po/tmp/fulladdr.glade.h:13
-#, fuzzy
 msgid "_City:"
-msgstr "»ýÀÏ(_B):"
+msgstr "½Ã(_C):"
 
 #: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
@@ -727,10 +732,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -741,27 +748,27 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "¼º(_F):"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "Á¦¸ñ(_T):"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "À̸§(_L):"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr ""
 
@@ -769,16 +776,21 @@ msgstr ""
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:269
+#: addressbook/gui/component/addressbook.c:237
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -790,59 +802,173 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
-msgstr ""
+msgstr "¸ðµÎ º¸±â"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
-msgstr "Ãß°¡..."
+msgstr "°í±Þ..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "Æú´õ Ž»ö±â°¡ Ç¥½ÃÇÒ URI"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
+msgstr "´Ù¸¥ ¿¬¶ôó"
+
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
+msgstr "LDAP ¼­¹ö"
+
+#: addressbook/gui/component/addressbook-config.c:141
+msgid "File"
+msgstr "ÆÄÀÏ"
+
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
+msgstr "¾Ë¼ö¾ø´Â ÁÖ¼Ò·Ï Çü½Ä"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr "ºñ¹Ð¹øÈ£"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "ºÙÀ̱â"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: po/tmp/mail-config-druid.glade.h:34
+msgid "Host:"
+msgstr "È£½ºÆ®:"
+
+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
+msgstr "Æ÷Æ®:"
+
+#: addressbook/gui/component/addressbook-config.c:364
+msgid "Root DN:"
+msgstr "·çÆ® DN:"
+
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "°Ë»ö"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-gui.c:943 po/tmp/mail-config-druid.glade.h:14
+msgid "Authentication:"
+msgstr "ÀÎÁõ:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-gui.c:934 po/tmp/mail-config-druid.glade.h:52
+msgid "Path:"
+msgstr "°æ·Î:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+msgid "Create path if it doesn't exist."
+msgstr "°æ·Î°¡ Á¸ÀçÇÏÁö ¾ÊÀ¸¸é ¸¸µì´Ï´Ù."
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr "ÁÖ¼Ò·Ï ÆíÁý"
+
+#: addressbook/gui/component/addressbook-config.c:595
+msgid "Add Addressbook"
+msgstr "ÁÖ¼Ò·Ï Ãß°¡"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: po/tmp/mail-config-druid.glade.h:45
+msgid "Name:"
+msgstr "À̸§:"
+
+#: addressbook/gui/component/addressbook-config.c:617
 #: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "¼³¸í:"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
-msgstr "LDAP ¼­¹ö:"
+#: po/tmp/addressbook-config.glade.h:7
+msgid "Addressbook Sources"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "À̸§:"
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
+#: mail/folder-browser.c:685 mail/mail-view.c:150
+#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:12
+#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
+#: po/tmp/mail-config-druid.glade.h:25 po/tmp/mail-config.glade.h:8
+msgid "Delete"
+msgstr "»èÁ¦"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Æ÷Æ® ¹øÈ£:"
+#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
+#: po/tmp/filter.glade.h:8 po/tmp/mail-config-druid.glade.h:29
+#: po/tmp/mail-config.glade.h:9
+msgid "Edit"
+msgstr "ÆíÁý"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr "·çÆ® DN:"
+#: po/tmp/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "À̸§"
+
+#: po/tmp/addressbook-config.glade.h:11
+msgid "URI"
+msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -861,7 +987,8 @@ msgid "Select Names"
 msgstr "¼±ÅÃÇÑ À̸§"
 
 #: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
+#, fuzzy
+msgid "Select name from:"
 msgstr "¸ñ·ÏÀ¸·ÎºÎÅÍ À̸§À» ¼±ÅÃ:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -905,7 +1032,7 @@ msgstr ""
 msgid "g"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
@@ -981,8 +1108,8 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "VCard·Î ÀúÀå"
 
@@ -1159,7 +1286,7 @@ msgstr "Çü½Ä À̸§:"
 msgid "Top:"
 msgstr "ˤ:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "ÇüÅÂ:"
 
@@ -1171,163 +1298,114 @@ msgstr "Æø:"
 msgid "label26"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "¿ÀÀü"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "¿ÀÈÄ"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-#, fuzzy
 msgid "Evolution Calendar Conduit"
-msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
+msgstr "Evolution ´Þ·Â ºÎÇ°"
 
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr ""
+msgstr "Evolution ´Þ·Â ºÎÇ°¿ë ¼³Á¤ µµ±¸.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
 #: calendar/conduits/todo/todo-conduit-control-applet.c:127
-#, fuzzy
 msgid "Evolution ToDo Conduit"
-msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
+msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ°"
 
 #: calendar/conduits/todo/todo-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
+msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ° ¼³Á¤ µµ±¸.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "À±°û:"
-
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "¸Ó¸´¸»:"
-
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "¾à¼Ó"
-
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "³ªÁß¿¡ ÇØ¾ß ÇÒ ÀÏ"
-
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "¿À´Ã ÇØ¾ß ÇÒ ÀÏ"
-
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "¹ú½á ´ÊÀº ÇؾßÇÒ ÀÏ"
-
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
-msgstr ""
+msgstr "´Þ·Â ¿­±â"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
+msgstr "´Þ·Â ÀúÀå"
+
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
-msgstr ""
+msgstr "ºÏ"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
-msgstr ""
+msgstr "³²"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
-msgstr ""
+msgstr "µ¿"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
-msgstr ""
+msgstr "¼­"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1336,46 +1414,46 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
-msgstr ""
+msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
@@ -1410,7 +1488,7 @@ msgstr "´Ý±â"
 msgid "Edit appointment"
 msgstr "¾à¼ÓÀ» ¼öÁ¤Çϱâ"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr ""
 
@@ -1463,13 +1541,12 @@ msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: po/tmp/cal-prefs-dialog.glade.h:16
-#, fuzzy
 msgid "Calendar"
-msgstr "»õ ´Þ·Â(_l)"
+msgstr "´Þ·Â"
 
 #: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
-msgstr ""
+msgstr "´Þ·Â ¼³Á¤"
 
 #: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
@@ -1511,15 +1588,13 @@ msgstr ""
 msgid "Fri"
 msgstr "±Ý"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
-#, fuzzy
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "±Ý¿äÀÏ"
 
 #: po/tmp/cal-prefs-dialog.glade.h:29
-#, fuzzy
 msgid "Highlight"
-msgstr "³ôÀÌ:"
+msgstr "°­Á¶"
 
 #: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
@@ -1541,7 +1616,7 @@ msgstr ""
 msgid "Mon"
 msgstr "¿ù"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "¿ù¿äÀÏ"
 
@@ -1557,7 +1632,7 @@ msgstr ""
 msgid "Pick a color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:31 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "¿ì¼±¼øÀ§"
 
@@ -1573,49 +1648,44 @@ msgstr ""
 msgid "Sat"
 msgstr "Åä"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
-#, fuzzy
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "Åä¿äÀÏ"
 
 #: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
-msgstr ""
+msgstr "º¸±â"
 
 #: po/tmp/cal-prefs-dialog.glade.h:45
-#, fuzzy
 msgid "Show appointment end times"
-msgstr "¾à¼Ó - %s"
+msgstr "¾à¼Ó ³¡½Ã°£ º¸±â"
 
 #: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr ""
 
 #: po/tmp/cal-prefs-dialog.glade.h:47
-#, fuzzy
 msgid "Start of day:"
-msgstr "½ÃÀÛ ³¯Â¥(_r):"
+msgstr "½ÃÀÛ ³¯Â¥:"
 
 #. Initialize by default to three-letter day names
 #: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "ÀÏ"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "ÀÏ¿äÀÏ"
 
 #: po/tmp/cal-prefs-dialog.glade.h:50
-#, fuzzy
 msgid "TaskPad"
-msgstr "ÀÛ¾÷"
+msgstr "ÀÛ¾÷Æеå"
 
 #: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "¸ñ"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
-#, fuzzy
+#: calendar/gui/event-editor.c:432 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "¸ñ¿äÀÏ"
 
@@ -1635,8 +1705,7 @@ msgstr ""
 msgid "Tue"
 msgstr "È­"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
-#, fuzzy
+#: calendar/gui/event-editor.c:430 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "È­¿äÀÏ"
 
@@ -1648,15 +1717,13 @@ msgstr ""
 msgid "Wed"
 msgstr "¼ö"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
-#, fuzzy
+#: calendar/gui/event-editor.c:431 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "¼ö¿äÀÏ"
 
 #: po/tmp/cal-prefs-dialog.glade.h:61
-#, fuzzy
 msgid "Work week"
-msgstr "ÁÖ"
+msgstr ""
 
 #: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
@@ -1664,7 +1731,34 @@ msgstr ""
 
 #: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
-msgstr ""
+msgstr "ÃÊ."
+
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Á¤¸»·Î ¾à¼Ó `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¾à¼ÓÀ» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ÀÛ¾÷À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Á¤¸»·Î ¿©ÇàÀÏÁ¤ `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¿©ÇàÀÏÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -1672,21 +1766,19 @@ msgstr ""
 #.
 #: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
-msgstr ""
+msgstr "% ¿Ï·á(_p):"
 
 #: po/tmp/task-editor-dialog.glade.h:7
-#, fuzzy
 msgid "C_lassification:"
-msgstr "ºÐ·ù"
+msgstr "ºÐ·ù(_l):"
 
 #: po/tmp/task-editor-dialog.glade.h:9
 msgid "Cancelled"
-msgstr ""
+msgstr "Ãë¼ÒµÊ"
 
 #: po/tmp/task-editor-dialog.glade.h:10
-#, fuzzy
 msgid "Completed"
-msgstr "¿Ï·áÀÏ"
+msgstr "¿Ï·áµÊ"
 
 #: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
@@ -1698,25 +1790,23 @@ msgstr ""
 
 #: po/tmp/task-editor-dialog.glade.h:15
 msgid "In Progress"
-msgstr ""
+msgstr "ÁøÇàÁß"
 
 #: po/tmp/task-editor-dialog.glade.h:16
-#, fuzzy
 msgid "Low"
-msgstr "Áö±Ý"
+msgstr ""
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: po/tmp/mail-config-druid.glade.h:47 po/tmp/task-editor-dialog.glade.h:17
+#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr ""
 
 #: po/tmp/task-editor-dialog.glade.h:18
-#, fuzzy
 msgid "Normal"
-msgstr "Çü½Ä"
+msgstr "º¸Åë"
 
 #: po/tmp/task-editor-dialog.glade.h:19
 msgid "Not Started"
@@ -1724,7 +1814,7 @@ msgstr ""
 
 #: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
-msgstr ""
+msgstr "¿ä¾à(_u)"
 
 #: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
@@ -1759,33 +1849,31 @@ msgid "task-editor-dialog"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor.c:681
-#, fuzzy
 msgid "Edit Task"
-msgstr "ÀÛ¾÷"
+msgstr "ÀÛ¾÷ ÆíÁý"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
 #, c-format
 msgid "Appointment - %s"
 msgstr "¾à¼Ó - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Journal entry - %s"
 msgstr "¿©Çà ÀÏÁ¤ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
-#, fuzzy
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
-msgstr "¸Þ¼¼Áö·Î º¯°æ»çÇ×À» ÀúÀåÇÒ·Á°í ÇÔ..."
+msgstr "º¯°æµÈ°ÍÀ» ÀúÀå ÇÏ±æ ¿øÇϽʴϱî?"
 
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
@@ -1797,19 +1885,11 @@ msgstr ""
 
 #: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
-msgstr ""
+msgstr "¿Ï·á Ç¥½Ã"
 
 #: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "»èÁ¦"
+msgstr "ÀÛ¾÷ÀÌ ¿Ï·áµÇ¾úÀ½À» Ç¥½Ã"
 
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
@@ -1822,50 +1902,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/print.c:610
+msgid "am"
+msgstr "¿ÀÀü"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/print.c:609
+msgid "pm"
+msgstr "¿ÀÈÄ"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "»õ ¾à¼Ó"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "ÇöÀç ¾à¼ÓÀ» ¼öÁ¤ÇÕ´Ï´Ù..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1885,9 +1977,8 @@ msgid "A_ll day event"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:8
-#, fuzzy
 msgid "Appointment Basics"
-msgstr "¾à¼Ó"
+msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
@@ -1898,9 +1989,8 @@ msgid "Custom recurrence"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:11
-#, fuzzy
 msgid "Days"
-msgstr "´å»õ¾¿ º¸À̱â"
+msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:13
 msgid "Every"
@@ -1923,18 +2013,16 @@ msgid "Minutes"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:19
-#, fuzzy
 msgid "Modify"
-msgstr "¿ù¿äÀÏ"
+msgstr "¼öÁ¤"
 
 #: po/tmp/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:21
-#, fuzzy
 msgid "Preview"
-msgstr "¹Ì¸®º¸±â:"
+msgstr "¹Ì¸®º¸±â"
 
 #: po/tmp/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
@@ -1981,9 +2069,8 @@ msgid "_Display"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:33
-#, fuzzy
 msgid "_End time:"
-msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
+msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
@@ -1998,14 +2085,12 @@ msgid "_Run program:"
 msgstr ""
 
 #: po/tmp/event-editor-dialog.glade.h:37
-#, fuzzy
 msgid "_Start time:"
-msgstr "½ÃÀÛ ³¯Â¥(_r):"
+msgstr "½ÃÀÛ ½Ã°£(_S):"
 
 #: po/tmp/event-editor-dialog.glade.h:38
-#, fuzzy
 msgid "_Starting date:"
-msgstr "½ÃÀÛ ³¯Â¥(_r):"
+msgstr "½ÃÀÛ ³¯Â¥(_S):"
 
 #: po/tmp/event-editor-dialog.glade.h:39
 msgid "day(s)"
@@ -2043,508 +2128,260 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "¾à¼ÓÀ» ¼öÁ¤ÇÑ´Ù"
 
-#: calendar/gui/event-editor.c:407
-#, fuzzy
+#: calendar/gui/event-editor.c:403
 msgid "on"
-msgstr "¿ù"
+msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "ÀÏ¿ù"
-
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "ÀÌ¿ù"
-
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "»ï¿ù"
-
-#: calendar/gui/getdate.y:394
-msgid "april"
-msgstr "»ç¿ù"
-
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "¿À¿ù"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "À¯¿ù"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "Ä¥¿ù"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr "ÆÈ¿ù"
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "±¸¿ù"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr ""
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "½Ã¿ù"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "½ÊÀÏ¿ù"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr "½ÊÀÌ¿ù"
-
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "ÀÏ¿äÀÏ"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "¿ù¿äÀÏ"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "È­¿äÀÏ"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr ""
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "¼ö¿äÀÏ"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr ""
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "¸ñ¿äÀÏ"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr ""
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr ""
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "±Ý¿äÀÏ"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "Åä¿äÀÏ"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr ""
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr ""
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr ""
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr ""
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "³»ÀÏ"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "¾îÁ¦"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "¿À´Ã"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "Áö±Ý"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "¸¶Áö¸·"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "´ÙÀ½"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr ""
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr ""
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr ""
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr ""
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr ""
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr ""
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr ""
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr ""
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr ""
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr ""
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr ""
-
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1152
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:687
+#, c-format
 msgid "Could not create a calendar in `%s'"
-msgstr "»õ ´Þ·ÂÀ» ¸¸µì´Ï´Ù"
+msgstr "`%s'¿¡¼­ ´Þ·ÂÀ» ¸¸µé¼ö ¾ø½À´Ï´Ù"
 
-#: calendar/gui/gnome-cal.c:1174
+#: calendar/gui/gnome-cal.c:698
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "È®ÀÎ"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr ""
-
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr ""
+#: calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "±×³ðÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr ""
-
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:936
-#, fuzzy
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "ÀÛ¾÷"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Àμ⠹̸®º¸±â"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
+msgstr "`%s'¿ë Àá±ÝÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
 #: camel/camel-lock.c:149 camel/camel-movemail.c:217
 #, c-format
@@ -2582,14 +2419,14 @@ msgid "Could not test lock file for %s: %s"
 msgstr ""
 
 #: camel/camel-movemail.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading mail file: %s"
-msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
+msgstr "¸ÞÀÏÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
 
 #: camel/camel-movemail.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
+msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
 
 #: camel/camel-movemail.c:272
 #, c-format
@@ -2612,9 +2449,8 @@ msgid "Movemail program failed: %s"
 msgstr ""
 
 #: camel/camel-movemail.c:355
-#, fuzzy
 msgid "(Unknown error)"
-msgstr "¿¡·¯ ¾øÀ½"
+msgstr "(¾Ë¼ö¾ø´Â ¿À·ù)"
 
 #: camel/camel-provider.c:133
 #, c-format
@@ -2626,60 +2462,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
-#, fuzzy, c-format
+#: camel/camel-remote-store.c:191
+#, c-format
 msgid "%s server %s"
-msgstr "´º½º ¼­¹ö"
+msgstr "%s ´º½º ¼­¹ö %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2701,51 +2538,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2757,31 +2594,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2789,7 +2620,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2830,11 +2661,9 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:137
 #: camel/providers/local/camel-local-store.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
 #: camel/providers/local/camel-local-store.c:168
 msgid "Local stores do not have a root folder"
@@ -2849,9 +2678,9 @@ msgid "Local folders may not be nested."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Local mail file %s"
-msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
+msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
 
 #: camel/providers/local/camel-local-store.c:256
 #, c-format
@@ -2871,32 +2700,33 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:148
 #: camel/providers/local/camel-maildir-folder.c:156
 #: camel/providers/local/camel-maildir-folder.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
+msgstr "¸ÞÀÏÆú´õ¿¡ ¸Þ¼¼Áö¸¦ µ¡ºÙÀϼö ¾ø½À´Ï´Ù: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
+#, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
-msgstr "½Ã½ºÅÛ ÀúÀåÀåÄ¡¸¦ ÁöÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù -- %s"
+msgstr ""
+"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
+"  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#, fuzzy
 msgid "No such message"
-msgstr "¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2911,18 +2741,18 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "Folder `%s' does not exist."
-msgstr "±× ÆÄÀÏÀº Á¸ÀçÇÏÁö¾Ê½À´Ï´Ù"
+msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
 
 #: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mh-store.c:109
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
+"Æú´õ `%s'¸¦ ¸¸µé¼ö ¾øÀ½:\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:128
@@ -2941,32 +2771,32 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
+#, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
+"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %2$s Æú´õ¿¡¼­ %1$s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3013,67 +2843,65 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-summary.c:609
+#, c-format
 msgid "Could not close temp folder: %s"
-msgstr ""
-"¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
-"%s"
+msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:147
 #: camel/providers/local/camel-mh-folder.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
+msgstr ""
 
 #: camel/providers/local/camel-mh-store.c:116
 #, c-format
@@ -3097,15 +2925,14 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-folder.c:115
+#, c-format
 msgid "Message %s not found."
-msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgstr "¸Þ¼¼Áö %s¸¦ ãÀ»¼ö ¾øÀ½."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
 msgid "Could not get group list from server."
-msgstr "gnomecal ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+msgstr "¼­¹ö¿¡¼­ ±×·ì¸ñ·ÏÀ» ¾òÀ»¼ö ¾øÀ½."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:94
 #: camel/providers/nntp/camel-nntp-grouplist.c:103
@@ -3148,16 +2975,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3191,54 +3018,54 @@ msgid ""
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:217
-#, fuzzy, c-format
+#, c-format
 msgid "Could not authenticate to KPOP server: %s"
-msgstr "gnomecal ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
+msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#, fuzzy
+#: po/tmp/mail-config-druid.glade.h:63
 msgid "Sendmail"
-msgstr "º¸³¿"
+msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid ""
@@ -3257,9 +3084,9 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:148
-#, fuzzy, c-format
+#, c-format
 msgid "Could not send message: %s"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
+msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:161
 #, c-format
@@ -3277,9 +3104,8 @@ msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:220
-#, fuzzy
 msgid "sendmail"
-msgstr "ÆíÁö ¹Þ±â"
+msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:222
 msgid "Mail delivery via the sendmail program"
@@ -3289,6 +3115,125 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+msgid "No authentication required"
+msgstr "ÀÎÁõÀÌ ÇÊ¿äÇÏÁö ¾ÊÀ½"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:297
+#: po/tmp/mail-config-druid.glade.h:16
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP ¼­¹ö %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr ""
@@ -3322,30 +3267,29 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
-#, fuzzy
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
-msgstr "÷ºÎÆÄÀÏ Ãß°¡"
+msgstr "÷ºÎ"
 
-#: composer/e-msg-composer-attachment-bar.c:417
+#: composer/e-msg-composer-attachment-bar.c:413
 #: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Á¦°Å"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "÷ºÎÆÄÀÏ ¸ñ·Ï¿¡¼­ ¼±ÅÃÇÑ Ç׸ñÀ» Á¦°ÅÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "÷ºÎÆÄÀÏ Ãß°¡..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
@@ -3365,157 +3309,165 @@ msgstr "ÆÄÀÏ À̸§:"
 msgid "MIME type:"
 msgstr "MIME Çü½Ä:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "º¸³½ÀÌ:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "ÁÖ¼Ò·Ï"
 
-#: composer/e-msg-composer-hdrs.c:291
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
-msgstr "¸Þ¼¼Áö¸¦ ¹ÞÀ»»ç¶÷À» ÀÔ·ÂÇϼ¼¿ä"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "¹Þ´Â»ç¶÷:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "¸Þ¼¼Áö¸¦ ¹ÞÀ»»ç¶÷À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "ÂüÁ¶:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷ÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:320
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "ÂüÁ¶ ¸ñ·Ï¿¡´Â ¾øÁö¸¸ ¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷µéÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Á¦¸ñ:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "ÆíÁöÀÇ Á¦¸ñÀ» ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "ÀúÀå..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "¸Þ¼¼Áö·Î º¯°æ»çÇ×À» ÀúÁ¤Áß..."
 
-#: composer/e-msg-composer.c:654
-#, fuzzy
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
-msgstr "¸Þ¼¼Áö·Î º¯°æ»çÇ×À» ÀúÁ¤Áß..."
+msgstr ""
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "±× ÆÄÀÏÀº Á¸ÀçÇÏÁö¾Ê½À´Ï´Ù"
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "¸ÞÀÏ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
 #: composer/evolution-composer.c:307
-#, fuzzy
 msgid "Cannot initialize Evolution's composer."
-msgstr "Evolution ½©À» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
+msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
 #: filter/e-search-bar.c:176
-#, fuzzy
 msgid "Sear_ch"
-msgstr "°Ë»ö"
+msgstr "°Ë»ö(_c)"
+
+#: filter/filter-datespec.c:62
+msgid "year"
+msgstr ""
 
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "¿¬µµ"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr ""
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr ""
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr ""
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr ""
 
@@ -3524,14 +3476,26 @@ msgid "days"
 msgstr ""
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr ""
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr ""
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr ""
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr ""
 
@@ -3581,6 +3545,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "Áö±Ý"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
@@ -3600,14 +3568,12 @@ msgstr ""
 
 #. "demand",
 #: filter/filter-editor.c:435
-#, fuzzy
 msgid "outgoing"
-msgstr "¹­±â"
+msgstr ""
 
 #: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
-#, fuzzy
 msgid "Edit Filters"
-msgstr "ÇÊÅÍ"
+msgstr "°Å¸£°Ô ÆíÁý"
 
 #. and now for the action area
 #: filter/filter-filter.c:401
@@ -3615,14 +3581,12 @@ msgid "Then"
 msgstr ""
 
 #: filter/filter-filter.c:414
-#, fuzzy
 msgid "Add action"
-msgstr "Çൿ(_n)"
+msgstr "Çൿ Ãß°¡"
 
 #: filter/filter-filter.c:420
-#, fuzzy
 msgid "Remove action"
-msgstr "Á¦°Å"
+msgstr "Çൿ Á¦°Å"
 
 #: filter/filter-folder.c:143
 msgid ""
@@ -3642,265 +3606,248 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:520
-#, fuzzy
+#: filter/filter-rule.c:530
 msgid "Rule name: "
-msgstr "ÆÄÀÏ À̸§:"
+msgstr "±ÔÄ¢ À̸§: "
 
-#: filter/filter-rule.c:524
-#, fuzzy
+#: filter/filter-rule.c:534
 msgid "Untitled"
-msgstr "(Á¦¸ñ¾øÀ½)"
+msgstr "Á¦¸ñ¾øÀ½"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "ÆíÁý"
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr "´äÀå"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr "Áß¿ä"
+
+#: filter/filter-system-flag.c:67
+msgid "Read"
+msgstr "ÀÐÀ½"
 
 #: po/tmp/filter.glade.h:10
-#, fuzzy
 msgid "Edit VFolders"
-msgstr "Æú´õ"
+msgstr "°¡»óÆú´õ ÆíÁý"
 
 #: po/tmp/filter.glade.h:11
-#, fuzzy
 msgid "Filter Rules"
-msgstr "ÇÊÅÍ"
+msgstr "°Å¸£°³ ±ÔÄ¢"
 
 #: po/tmp/filter.glade.h:12
 msgid "Incoming"
 msgstr ""
 
 #: po/tmp/filter.glade.h:13
-#, fuzzy
 msgid "Outgoing"
-msgstr "À±°û:"
+msgstr ""
 
 #: po/tmp/filter.glade.h:15
-#, fuzzy
 msgid "Virtual Folders"
-msgstr "Æú´õ"
+msgstr "°¡»ó Æú´õ"
 
 #: po/tmp/filter.glade.h:16
-#, fuzzy
 msgid "vFolder Sources"
-msgstr "Æú´õ"
+msgstr "°¡»ó Æú´õ ¼Ò½º"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
-#, fuzzy
-msgid "Date received"
-msgstr "¹Þ¾ÒÀ½"
+msgid "before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Date sent"
-msgstr "³¯Â¥"
+msgid "contains"
+msgstr "Æ÷ÇÔ"
+
+#: filter/libfilter-i18n.h:7
+msgid "Copy to Folder"
+msgstr "Æú´õ·Î º¹»ç"
 
 #: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "Á÷¾÷(_P):"
+msgid "Date received"
+msgstr "³¯Â¥ ¹Þ¾ÒÀ½"
 
 #: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù¸¥»ç¶÷¿¡°Ô Àü´ÞÇÕ´Ï´Ù"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr ""
+msgid "Date sent"
+msgstr "³¯Â¥ º¸³ÂÀ½"
 
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-#, fuzzy
-msgid "Message was received"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
+msgid "does not exist"
+msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Recipients"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï:"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "º¸³¿"
+msgid "Expression"
+msgstr "Ç¥Çö"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "»óÅÂ(_S):"
+msgid "Forward to Address"
+msgstr "Àü´ÞÇÒ ÁÖ¼Ò"
 
 #: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Á¤·Ä"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "»óÅÂ(_S):"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Á¦¸ñ"
+msgid "Message Body"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "³¯Â¥"
+msgid "Message Header"
+msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
+msgid "Message was received"
+msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
 
 #: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "Çൿ(_n)"
+msgid "Message was sent"
+msgstr "¸Þ¼¼Áö¸¦ º¸³Â½À´Ï´Ù"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+msgid "Move to Folder"
+msgstr "Æú´õ·Î À̵¿"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "does not exist"
-msgstr "±× ÆÄÀÏÀº Á¸ÀçÇÏÁö¾Ê½À´Ï´Ù"
-
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
+msgid "Recipients"
+msgstr "ÂüÁ¶ÀÎ"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "exists"
-msgstr "´ÙÀ½"
+msgid "Sender"
+msgstr "º¸³½ÀÌ"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+msgid "Set Status"
+msgstr "»óÅ ¼³Á¤"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+msgid "Status"
+msgstr "»óÅÂ"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Á¦¸ñ"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3919,9 +3866,8 @@ msgid "Edit Score Rule"
 msgstr ""
 
 #: filter/score-rule.c:192 filter/score-rule.c:194
-#, fuzzy
 msgid "Score"
-msgstr "Á¤·Ä"
+msgstr ""
 
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
@@ -3931,163 +3877,187 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
-msgstr ""
+msgstr "º»¹®À̳ª Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔ"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
-msgstr ""
+msgstr "º»¹®¿¡ ´ÙÀ½À» Æ÷ÇÔ"
 
-#: mail/folder-browser.c:155
-#, fuzzy
+#: mail/folder-browser.c:238
 msgid "Subject contains"
-msgstr "Á¦¸ñ"
+msgstr "Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔ"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
-msgstr ""
+msgstr "º»¹®¿¡ ´ÙÀ½À» Æ÷ÇÔÇÏÁö ¾ÊÀ½"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
-msgstr ""
+msgstr "Á¦¸ñ¿¡ ´ÙÀ½À» Æ÷ÇÔÇÏÁö ¾ÊÀ½"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
-#, fuzzy
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
-msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå(_S)"
+msgstr ""
 
-#: mail/folder-browser.c:455
-#, fuzzy
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
+msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
-#, fuzzy
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
-msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå(_S)"
+msgstr ""
 
-#: mail/folder-browser.c:459
-#, fuzzy
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
-msgstr "¹Þ´Â»ç¶÷ ¸ñ·Ï"
+msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
-#, fuzzy
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr "¼û±ä°Í ¸ðµÎ º¸±â"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+msgid "Hide read"
+msgstr ""
+
+#: mail/folder-browser.c:661
+msgid "Hide deleted"
+msgstr ""
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+msgid "Hide Subject"
+msgstr ""
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+msgid "Hide from Sender"
+msgstr ""
+
+#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
-msgstr "¿­±â..."
+msgstr "¿­±â"
 
-#: mail/folder-browser.c:466
-#, fuzzy
+#: mail/folder-browser.c:672
 msgid "Save As..."
-msgstr "ÀúÀå..."
+msgstr "»õ À̸§À¸·Î ÀúÀå..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: mail/folder-browser.c:673 mail/mail-view.c:148
 #: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Àμâ"
 
-#: mail/folder-browser.c:469
-#, fuzzy
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
-msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå(_S)"
+msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "¸ðµÎ ´äÀå"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: mail/folder-browser.c:677 mail/mail-view.c:144
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Àü´Þ"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
-#, fuzzy
+#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
-msgstr "Àü´Þ"
+msgstr ""
 
-#: mail/folder-browser.c:474
-#, fuzzy
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
-msgstr "¸ðµÎ ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_M)"
+msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã"
 
-#: mail/folder-browser.c:475
-#, fuzzy
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
-msgstr "¸ðµÎ ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_M)"
+msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
 
-#: mail/folder-browser.c:477
-#, fuzzy
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
+msgstr "Æú´õ·Î À̵¿..."
 
-#: mail/folder-browser.c:478
-#, fuzzy
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
+msgstr "Æú´õ·Î º¹»ç..."
 
-#: mail/folder-browser.c:480
-#, fuzzy
+#: mail/folder-browser.c:686
 msgid "Undelete"
-msgstr "»èÁ¦"
+msgstr "µÇ»ì¸²"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
-#, fuzzy
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
-msgstr "ÇÊÅÍ"
+msgstr "°Å¸£°³ Àû¿ë"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
+msgid "Hide Messages"
+msgstr "¸Þ¼¼Áö ¼û±è"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Á¦¸ñ \"%s\" ¼û±è"
+
+#: mail/folder-browser.c:793
+#, c-format
+msgid "Hide from Sender <%s>"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
 #: mail/mail-autofilter.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "Subject is %s"
-msgstr "Á¦¸ñ"
+msgstr ""
 
 #: mail/mail-autofilter.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "Mail from %s"
-msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
+msgstr ""
 
 #: mail/mail-autofilter.c:331
 #, c-format
@@ -4126,95 +4096,327 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "Àü´ÞµÈ ¸Þ½ÃÁö:\n"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
-#, fuzzy
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
-msgstr "¸Þ¼¼Áö¸¦ ÀúÀåÇÕ´Ï´Ù"
+msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
 
-#: mail/mail-callbacks.c:750
-#, fuzzy
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
-msgstr "¸Þ¼¼Áö¸¦ ÀúÀåÇÕ´Ï´Ù"
+msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:922
-#, fuzzy
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
-msgstr "¸Þ¼¼Áö Àμâ(_P)"
+msgstr "¸Þ¼¼Áö Àμâ"
 
-#: mail/mail-callbacks.c:969
-#, fuzzy
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
-msgstr "¸Þ¼¼Áö Àμâ(_P)"
+msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
 
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
 #: po/tmp/mail-config-druid.glade.h:6
-msgid "Identity"
+msgid "Account"
 msgstr ""
 
 #: po/tmp/mail-config-druid.glade.h:7
+#, fuzzy
+msgid "Account Information"
+msgstr "Á¤º¸ ¾øÀ½"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "÷ºÎ ¼Ó¼º"
+
+#: po/tmp/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "°í±Þ..."
+
+#: po/tmp/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "ÀÎÁõ:"
+
+#: po/tmp/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "ÀÎÁõ:"
+
+#: po/tmp/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:17
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:24
+#, fuzzy
+msgid "Default"
+msgstr "»èÁ¦"
+
+#: po/tmp/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
+
+#: po/tmp/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
+
+#: po/tmp/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
+
+#: po/tmp/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#: po/tmp/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "ÀüüÀ̸§:"
+
+#: po/tmp/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "È£½ºÆ®:"
+
+#: po/tmp/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:37
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:39
+msgid "Kerberos"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "ÆíÁö ¹Þ±â"
+
+#: po/tmp/mail-config-druid.glade.h:41
+msgid "Mail Account"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
+#: po/tmp/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#: po/tmp/mail-config-druid.glade.h:44
+msgid "Make this my default account"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
+#: po/tmp/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "»õ·Î¿î(_N)"
+
+#: po/tmp/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "¼³Á¤"
+
+#: mail/mail-config-gui.c:485 po/tmp/mail-config-druid.glade.h:49
+msgid "Organization:"
+msgstr "Á¶Á÷:"
+
+#: po/tmp/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "ºñ¹Ð¹øÈ£"
+
+#: po/tmp/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
+
+#: mail/mail-format.c:628 po/tmp/mail-config-druid.glade.h:56
+msgid "Reply-To:"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "´äÀå"
+
+#: po/tmp/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "VCard·Î ÀúÀå"
+
+#: po/tmp/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "¼­¸í ÆÄÀÏ:"
+
+#: po/tmp/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³¿"
+
+#: po/tmp/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#: po/tmp/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "¼­¹ö:"
+
+#: po/tmp/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "¼­¹ö:"
+
+#: mail/mail-config-gui.c:496 po/tmp/mail-config-druid.glade.h:69
+msgid "Signature file:"
+msgstr "¼­¸í ÆÄÀÏ:"
+
+#: po/tmp/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "¼­¸í ÆÄÀÏ:"
+
+#: po/tmp/mail-config-druid.glade.h:71 po/tmp/mail-config.glade.h:20
+msgid "Sources"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: po/tmp/mail-config-druid.glade.h:72
+msgid "This server requires a secure connection (SSL)"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: po/tmp/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "ÇüÅÂ:"
+
+#: po/tmp/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Á¤º¸ ¾øÀ½"
+
+#: mail/mail-config-gui.c:928 po/tmp/mail-config-druid.glade.h:77
+msgid "Username:"
+msgstr "»ç¿ëÀÚÀ̸§:"
+
+#: po/tmp/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:81
+msgid "minute(s)"
 msgstr ""
 
 #: mail/mail-config-gui.c:433
@@ -4232,14 +4434,6 @@ msgstr "ÀüüÀ̸§:"
 msgid "Email address:"
 msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Á¶Á÷:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "¼­¸í ÆÄÀÏ:"
-
 #: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "¼­¸í ÆÄÀÏ"
@@ -4248,26 +4442,10 @@ msgstr "¼­¸í ÆÄÀÏ"
 msgid "Server:"
 msgstr "¼­¹ö:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "»ç¿ëÀÚÀ̸§:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "°æ·Î:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "ÀÎÁõ:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr ""
@@ -4277,9 +4455,8 @@ msgid "Test Settings"
 msgstr ""
 
 #: mail/mail-config-gui.c:1130
-#, fuzzy
 msgid "Mail source type:"
-msgstr "±ÞÁö¹æ¹ý:"
+msgstr "¸ÞÀÏ ¼Ò½º Çü½Ä:"
 
 #: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
@@ -4291,9 +4468,8 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-gui.c:1154
-#, fuzzy
 msgid "News source type:"
-msgstr "»õ ÀüÈ­ ÇüÅÂ"
+msgstr "´º½º ¼Ò½º Çü½Ä:"
 
 #: mail/mail-config-gui.c:1159
 msgid ""
@@ -4333,9 +4509,9 @@ msgid "Edit News Server"
 msgstr ""
 
 #: mail/mail-config-gui.c:2253
-#, fuzzy, c-format
+#, c-format
 msgid "Testing \"%s\""
-msgstr "\"%s\"¸¦ »ý¼ºÁß"
+msgstr "\"%s\" ½ÃÇèÁß"
 
 #: mail/mail-config-gui.c:2255
 #, c-format
@@ -4368,6 +4544,10 @@ msgstr ""
 msgid "Mail Sources"
 msgstr ""
 
+#: po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
 #: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr ""
@@ -4388,499 +4568,388 @@ msgstr "Á¶Á÷"
 msgid "Send messages in HTML format"
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:218
-#, fuzzy
+#: mail/mail-display.c:229
 msgid "Save Attachment"
-msgstr "°íÄ¥¿¹Á¤: ÷ºÎÆÄÀÏ ÀúÀå..."
+msgstr "÷ºÎ ÀúÀå"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:300
-#, fuzzy
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
-msgstr "ÀúÀå..."
+msgstr "µð½ºÅ©·Î ÀúÀå..."
 
-#: mail/mail-display.c:302
-#, fuzzy, c-format
+#: mail/mail-display.c:313
+#, c-format
 msgid "Open in %s..."
-msgstr "¿­±â..."
+msgstr "%s¿¡¼­ ¿­±â..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
-#, fuzzy
+#: mail/mail-display.c:366
 msgid "Hide"
-msgstr "¸Ó¸®¸»:"
+msgstr "¼û±è"
 
-#: mail/mail-format.c:500
-#, fuzzy, c-format
+#: mail/mail-format.c:503
+#, c-format
 msgid "%s attachment"
-msgstr "÷ºÎÆÄÀÏ Ãß°¡"
-
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "´äÀå"
+msgstr "%s ÷ºÎ"
 
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
-#, fuzzy
+#: mail/mail-format.c:869
 msgid "Encrypted message"
-msgstr "¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+msgstr "¾ÏȣȭµÈ ¸Þ¼¼Áö"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
 #, fuzzy
-msgid "Closing current folder"
+msgid "Reconfiguring folder"
 msgstr "Æú´õ ¼³Á¤(_C)"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:269
+msgid "Closing current folder"
+msgstr "ÇöÀç Æú´õ ´Ý´ÂÁß"
+
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
-#, fuzzy
+#: mail/mail-local.c:313
 msgid "Creating new folder"
-msgstr "»õ Æú´õ »ý¼º(_C)..."
+msgstr "»õ Æú´õ¸¦ »ý¼º"
 
-#: mail/mail-local.c:329
-#, fuzzy
+#: mail/mail-local.c:327
 msgid "Copying messages"
-msgstr "¸Þ¼¼Áö º¹»ç(_C)"
+msgstr "¸Þ¼¼Áö º¹»ç"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Æú´õ `%s'¸¦ ¸¸µé¼ö ¾øÀ½:\n"
+"%s"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "%s¿¡¼­ ÆíÁö °¡Á®¿À±â"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" º¸³»´Â Áß"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "\"%s\" º¸³¿"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:553
 #, fuzzy
+msgid "Sending message"
+msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³¿"
+
+#: mail/mail-ops.c:669
 msgid "Sending queue"
-msgstr "\"%s\" º¸³»´Â Áß"
+msgstr "´ë±â¿­·Î º¸³»´ÂÁß"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
-#, fuzzy, c-format
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#, c-format
 msgid "Appending \"%s\""
-msgstr "\"%s\" º¸³»´Â Áß"
+msgstr "\"%s\"¿¡ µ¡ºÙÀÌ´ÂÁß"
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "\"%s\" Á¦°Å Áß"
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "\"%s\" Á¦°Å"
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "À̵¿Áß"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "º¹»çÁß"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1175
-#, fuzzy, c-format
-msgid "Marking message %d of %d"
-msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´ÞÇÕ´Ï´Ù"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(¼³¸í ¾øÀ½)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´ÞÇÕ´Ï´Ù"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´Þ"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
+#: mail/mail-ops.c:1164
+msgid "Forwarded messages"
+msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1336
 #, fuzzy
-msgid "Forwarded messages"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
+msgid "Synchronising folder"
+msgstr "µ¿±âÈ­"
 
-#: mail/mail-ops.c:1679
+#: mail/mail-ops.c:1386
 #, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "\"%s\"¸¦ ÀûÀç Áß"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "\"%s\"¸¦ ÀûÀç"
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "\"%s\"¸¦ »ý¼ºÁß"
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "\"%s\"¸¦ »ý¼º"
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
+msgid "Expunging folder"
+msgstr "\"%s\" Á¦°Å Áß"
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´ÞÇÕ´Ï´Ù"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "¸Þ¼¼Áö º¹»ç"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1655
 #, fuzzy, c-format
-msgid "Loading %s Folder"
-msgstr "\"%s\"¸¦ ÀûÀç Áß"
+msgid "Loading %s Folder for %s"
+msgstr "%s Æú´õ¿¡ ÀûÀçÁß"
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "Load %s Folder"
-msgstr "\"%s\"¸¦ ÀûÀç"
+msgid "Load %s Folder for %s"
+msgstr "%s Æú´õ¿¡ ÀûÀç"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "¸Þ¼¼Áö º¹»ç"
 
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
 
-#: mail/mail-ops.c:2339
+#: mail/mail-ops.c:1915
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "¸Þ¼¼Áö \"%s\"¸¦ Àü´ÞÇÕ´Ï´Ù"
-
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1929
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î À̵¿ÇÕ´Ï´Ù"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
 
-#: mail/mail-ops.c:2474
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "È®ÀÎ"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4890,128 +4959,141 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
-#, fuzzy, c-format
+#: mail/mail-tools.c:241
+#, c-format
 msgid "Examining %s"
-msgstr "\"%s\" Á¦°Å Áß"
+msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
-#, fuzzy, c-format
+#: mail/mail-tools.c:347
+#, c-format
 msgid "Saving changes to %s"
-msgstr "¸Þ¼¼Áö·Î º¯°æ»çÇ×À» ÀúÁ¤Áß..."
+msgstr "%s·Î º¯°æ ÀúÀåÁß"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö (Á¦¸ñ ¾øÀ½)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
-#, fuzzy
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
-msgstr "Æú´õ"
+msgstr "°¡»ó Æú´õ"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
-msgstr "»õ VÆú´õ"
+msgstr "»õ °¡»óÆú´õ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "´äÀå"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ º¸³½»ç¶÷¿¡°Ô ´äÀåÀ» ÇÕ´Ï´Ù"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ¹ÞÀº ¸ðµç »ç¶÷¿¡°Ô ´äÀåÀ» ÇÕ´Ï´Ù"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù¸¥»ç¶÷¿¡°Ô Àü´ÞÇÕ´Ï´Ù"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
-#, fuzzy
+#: mail/message-list.c:593
 msgid "Seen"
-msgstr "º¸³¿"
+msgstr ""
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
 msgstr ""
 
 #: mail/subscribe-dialog.c:139
@@ -5028,27 +5110,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr ""
 
@@ -5062,23 +5144,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5086,14 +5168,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5101,7 +5183,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5132,7 +5214,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "»õ·Î¿î..."
 
@@ -5140,23 +5222,19 @@ msgstr "»õ·Î¿î..."
 msgid "(Untitled)"
 msgstr "(Á¦¸ñ¾øÀ½)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "½Ã½ºÅÛÀÇ °æ·Î¿¡ Bug buddy¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy¸¦ ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5166,7 +5244,7 @@ msgstr ""
 "ÀÏÁ¤, ¿¬¶ôó °ü¸®¸¦ ÇÏ´Â ±×·ì¿þ¾î ÀÀ¿ëÇÁ·Î±×·¥\n"
 "¸ðÀ½ ÀÔ´Ï´Ù."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr ""
 
@@ -5196,14 +5274,12 @@ msgid ""
 msgstr ""
 
 #: shell/e-shortcuts-view.c:122
-#, fuzzy
 msgid "Create new shortcut group"
-msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
+msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
 
 #: shell/e-shortcuts-view.c:125
-#, fuzzy
 msgid "Group name:"
-msgstr "ÀüüÀ̸§:"
+msgstr "±×·ì À̸§:"
 
 #: shell/e-shortcuts-view.c:234
 #, c-format
@@ -5225,7 +5301,6 @@ msgid "Show the shortcuts as small icons"
 msgstr "ÀÛÀº ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
 
 #: shell/e-shortcuts-view.c:253
-#, fuzzy
 msgid "_Large Icons"
 msgstr "Å« ¾ÆÀÌÄÜ(_L)"
 
@@ -5234,27 +5309,24 @@ msgid "Show the shortcuts as large icons"
 msgstr "Å« ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
 
 #: shell/e-shortcuts-view.c:265
-#, fuzzy
 msgid "_New Group..."
-msgstr "»õ·Î¿î..."
+msgstr "»õ ±×·ì(_N)..."
 
 #: shell/e-shortcuts-view.c:266
-#, fuzzy
 msgid "Create a new shortcut group"
-msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
+msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
 
 #: shell/e-shortcuts-view.c:268
 msgid "_Remove This Group..."
 msgstr ""
 
 #: shell/e-shortcuts-view.c:269
-#, fuzzy
 msgid "Remove this shortcut group"
-msgstr "´ÜÃà ¸·´ë º¸±â"
+msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
 #: shell/e-shortcuts-view.c:353
 msgid "Activate"
-msgstr ""
+msgstr "È°¼º"
 
 #: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
@@ -5269,10 +5341,10 @@ msgid "Error saving shortcuts."
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
 #: shell/e-storage-set-view.c:235
 msgid "_View"
-msgstr ""
+msgstr "º¸±â(_V)"
 
 #: shell/e-storage-set-view.c:235
 msgid "View the selected folder"
@@ -5288,27 +5360,27 @@ msgstr "¿¡·¯ ¾øÀ½"
 
 #: shell/e-storage.c:391
 msgid "Generic error"
-msgstr ""
+msgstr "ÀÏ¹Ý ¿À·ù"
 
 #: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
-msgstr ""
+msgstr "°°Àº À̸§ÀÇ Æú´õ°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù"
 
 #: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
-msgstr ""
+msgstr "ÁöÁ¤µÈ ÆúÅÍ Çü½ÄÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
 
 #: shell/e-storage.c:397
 msgid "I/O error"
-msgstr ""
+msgstr "ÀÔÃâ·Â ¿À·ù"
 
 #: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
-msgstr ""
+msgstr "Æú´õ¸¦ ¸¸µé±â¿¡ ÃæºÐÇÑ °ø°£ÀÌ ¾øÀ½"
 
 #: shell/e-storage.c:401
 msgid "The specified folder was not found"
-msgstr ""
+msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
 
 #: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
@@ -5316,23 +5388,23 @@ msgstr ""
 
 #: shell/e-storage.c:405
 msgid "Permission denied"
-msgstr ""
+msgstr "Çã°¡±Ç °ÅºÎ"
 
 #: shell/e-storage.c:407
 msgid "Operation not supported"
-msgstr ""
+msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
 #: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
-msgstr ""
+msgstr "ÀÌ ÀúÀå¸Åü¿¡ ÁöÁ¤µÈ Çü½ÄÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5347,6 +5419,24 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we eagerly\n"
 "await your contributions!\n"
 msgstr ""
+"¾È³çÇϼ¼¿ä. Evolution ±×·ì¿þ¾î ½´Æ®ÀÇ ¹Ì¸®º¸±â ¸±¸®Á ³»·Á¹Þ´Âµ¥\n"
+"½Ã°£À» ÇÒ¾ÖÇØÁּż­ °¨»çÇÕ´Ï´Ù.\n"
+"\n"
+"Áö³­ ¸±¸®Á ÅëÇؼ­, ¿ì¸®ÀÇ ÃÊÁ¡Àº EvolutionÀ» »ç¿ëÇÒ¸¸ÇÏ°Ô Çϴµ¥\n"
+"ÀÖ½À´Ï´Ù. ¸¹Àº Evolution°³¹ßÀÚµéÀÌ EvolutionÀ» »ç¿ëÇÏ¿©¼­ ¸ÅÀÏ ±×µé\n"
+"ÀÇ ¸ÞÀÏÀ» ¹Þ¾Æº¸°í ÀÖ½À´Ï´Ù. ¿©·¯ºÐµµ ¸¶Âù°¡Áö±¸¿ä. (Ç×»ó ¹é¾÷À»\n"
+"ÇصνʽÿÀ.)\n"
+"\n"
+"ÇÏÁö¸¸ ¾ÈÁ¤¼º°ú º¸¾È¿¡ ¿µÇâÀ» ³¢Ä¡´Â ¸¹Àº ¹ö±×¸¦ ¼öÁ¤ÇÏ°í ÀÖÁö¸¸\n"
+"¿©·¯ºÐÀº ±Ç¸®Æ÷±â¸¦ ÇÏ¿©¾ß ÇÕ´Ï´Ù: EvolutionÀº ¿©·¯ºÐÀÌ ¿øÇÏÁö \n"
+"¾Ê´õ¶óµµ ¸ÞÀÏÀ» Æı«Çϰųª ÀÒ¾î ¹ö¸±¼ö ÀÖÀ¸¸ç, ½ÇÇàµÇ´Â ÇÁ·Î¼¼½º\n"
+"¸¦ ³õÄ¥¼öµµ ÀÖ°í, CPU¸¦ 100%¼Ò¸ð, °æÀï, ¸ØÃã, ÀÓÀÇÀÇ ¸ÞÀϸµ ¸®½ºÆ®\n"
+"·Î HTML¸ÞÀÏ º¸³»¹ö¸², ´ç½Å¾ÕÀÇ Ä£±¸³ª Á÷À嵿·á¿¡°Ô ¹æÇØ°¡ µÉ¼ö\n"
+"ÀÖ½À´Ï´Ù.\n"
+"Áö½Ã´ë·Î »ç¿ëÇϽʽÿÀ.\n"
+"\n"
+"¿ì¸®ÀÇ Èûµç °á°ú¹°ÀÌ ¿©·¯ºÐÀ» Áñ°Ì°Ô Çϱ⸦ ¹Ù¶ø´Ï´Ù, ±×¸®°í \n"
+"¿©·¯ºÐµéÀÇ °øÇåÀ» ¸÷½Ã ¹Ù¶ó°í ÀÖ½À´Ï´Ù!\n"
 
 #: shell/main.c:101
 msgid ""
@@ -5368,19 +5458,6 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "º¸³ëº¸ ÄÄÆ÷³ÍÆ® ½Ã½ºÅÛÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr ""
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-#, fuzzy
-msgid "_Actions"
-msgstr "Çൿ(_n)"
-
 #: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
@@ -5400,39 +5477,41 @@ msgstr "¿¬¶ôó ã¾Æº»´Ù"
 
 #: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
-msgstr "»õ ¿¬¶ôó"
+msgstr ""
 
 #: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
-msgstr "¿¬¶ôó¸¦ ÀμâÇÑ´Ù"
+msgstr "¿¬¶ôó¸¦ ÀμâÇÕ´Ï´Ù"
 
 #: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
-msgstr ""
+msgstr "ÁßÁö"
 
 #: po/tmp/evolution-addressbook.xml.h:16
-#, fuzzy
 msgid "Stop Loading"
-msgstr "¸í¾Ï"
+msgstr ""
 
 #: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr ""
 
 #: po/tmp/evolution-addressbook.xml.h:18
-#, fuzzy
 msgid "View all contacts"
-msgstr "¿¬¶ôó ã¾Æº»´Ù"
+msgstr "¸ðµç ¿¬¶ôó º¸±â"
 
 #: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Addressbook Configuration..."
+msgstr "ÁÖ¼Ò·Ï ¼³Á¤(_A)..."
+
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "¿¬¶ôó¸¦ Àμâ(_P)..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: po/tmp/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
-msgstr ""
+msgstr "¿¬¶ôó ã±â(_S)"
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:22
 #: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "µµ±¸(_T)"
@@ -5443,16 +5522,15 @@ msgstr "µµ±¸(_T)"
 #.
 #: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
-msgstr "´å»õ¾¿ º¸À̱â"
+msgstr "´å»õ¾¿"
 
 #: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
 #: po/tmp/evolution-calendar.xml.h:8
-#, fuzzy
 msgid "Ca_lendar"
-msgstr "»õ ´Þ·Â(_l)"
+msgstr "´Þ·Â(_l)"
 
 #: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
@@ -5480,11 +5558,11 @@ msgstr ""
 
 #: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
-msgstr ""
+msgstr "°¡±â"
 
 #: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
-msgstr "ÀÓÀÇÀÇ ³¯·Î °¡±â"
+msgstr "ÁöÁ¤ÇÑ ³¯·Î °¡±â"
 
 #: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
@@ -5492,7 +5570,7 @@ msgstr ""
 
 #: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
-msgstr ""
+msgstr "´Þ"
 
 #: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
@@ -5508,7 +5586,7 @@ msgstr "ÀÌÀü"
 
 #: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
-msgstr ""
+msgstr "ÀÌ ´Þ·Â ÀμâÇϱâ"
 
 #: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
@@ -5516,21 +5594,21 @@ msgstr ""
 
 #: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
-msgstr "ÇϷ羿 º¸À̱â"
+msgstr "ÇϷ羿 º¸±â"
 
 #: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
-msgstr ""
+msgstr "ÇÑ´Þ¾¿ º¸±â"
 
 #: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
-msgstr ""
+msgstr "ÇÑÁÖ¾¿ º¸±â"
 
 #: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "¿À´Ã"
 
@@ -5543,38 +5621,32 @@ msgid "_New"
 msgstr "»õ·Î¿î(_N)"
 
 #: po/tmp/evolution-calendar.xml.h:33
-#, fuzzy
 msgid "_Open Calendar"
-msgstr "´Þ·Â ¿­±â(_l)"
+msgstr "´Þ·Â ¿­±â(_O)"
 
 #: po/tmp/evolution-calendar.xml.h:34
-#, fuzzy
 msgid "_Print this calendar"
-msgstr "ÀÌ Ç׸ñÀ» Àμâ"
+msgstr "ÀÌ ´Þ·Â Àμâ(_P)"
 
 #: po/tmp/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Save Calendar As"
-msgstr "´Þ·Â ÀúÀå"
+msgid "_Save As..."
+msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_S)..."
 
 #: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "ÀÌ Ç׸ñ¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
 #: po/tmp/evolution-contact-editor.xml.h:8
-#, fuzzy
 msgid "Delete..."
-msgstr "»èÁ¦"
+msgstr "»èÁ¦..."
 
 #: po/tmp/evolution-contact-editor.xml.h:9
-#, fuzzy
 msgid "Help"
-msgstr "µµ¿ò¸»(_H)"
+msgstr "µµ¿ò¸»"
 
 #: po/tmp/evolution-contact-editor.xml.h:10
-#, fuzzy
 msgid "Print En_velope..."
-msgstr "Àμâ..."
+msgstr "ºÀÅõ Àμâ(_v)..."
 
 #: po/tmp/evolution-contact-editor.xml.h:11
 #: po/tmp/evolution-event-editor.xml.h:81
@@ -5588,10 +5660,9 @@ msgstr "Àμâ..."
 
 #: po/tmp/evolution-contact-editor.xml.h:13
 #: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save _As..."
-msgstr "ÀúÀå..."
+msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_A)..."
 
 #: po/tmp/evolution-contact-editor.xml.h:14
 #: po/tmp/evolution-event-editor.xml.h:90
@@ -5599,7 +5670,6 @@ msgid "Save and Close"
 msgstr "ÀúÀåÈÄ ¸¶Ä§"
 
 #: po/tmp/evolution-contact-editor.xml.h:15
-#, fuzzy
 msgid "Save the contact and close the dialog box"
 msgstr "¾à¼ÓÀ» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
 
@@ -5618,22 +5688,20 @@ msgstr ""
 
 #: po/tmp/evolution-contact-editor.xml.h:19
 #: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:42
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "ÆÄÀÏ(_F)"
 
 #: po/tmp/evolution-contact-editor.xml.h:20
-#, fuzzy
 msgid "_Print..."
-msgstr "Àμâ..."
+msgstr "Àμâ(_P)..."
 
 #: po/tmp/evolution-contact-editor.xml.h:21
 #: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:46
 msgid "_Save"
-msgstr "ÀúÀå"
+msgstr "ÀúÀå(_S)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -5641,36 +5709,31 @@ msgstr "ÀúÀå"
 #.
 #: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
-msgstr ""
+msgstr "ÀÌ ÀÀ¿ëÇÁ·Î±×·¥¿¡ ´ëÇÏ¿©"
 
 #: po/tmp/evolution-event-editor.xml.h:7
-#, fuzzy
 msgid "About..."
-msgstr "±Û²Ã..."
+msgstr "ÀÌ ÇÁ·Î±×·¥Àº..."
 
 #: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Çൿ(_n)"
 
 #: po/tmp/evolution-event-editor.xml.h:9
-#, fuzzy
 msgid "C_lear"
-msgstr "ÀÚµ¿Â÷"
+msgstr "ºñ¿ò(_l)"
 
 #: po/tmp/evolution-event-editor.xml.h:10
-#, fuzzy
 msgid "C_ut"
-msgstr "ÀÚ¸£±â"
+msgstr "ÀÚ¸£±â(_u)"
 
 #: po/tmp/evolution-event-editor.xml.h:11
-#, fuzzy
 msgid "Clear"
-msgstr "ÀÚµ¿Â÷"
+msgstr "ºñ¿ò"
 
 #: po/tmp/evolution-event-editor.xml.h:12
-#, fuzzy
 msgid "Clear the selection"
-msgstr "¼±ÅÃµÈ Æú´õ º¸±â"
+msgstr "¼±ÅÃÇÑ ºÎºÐ ºñ¿ò"
 
 #: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
@@ -5682,7 +5745,7 @@ msgstr "º¹»ç"
 
 #: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
-msgstr ""
+msgstr "¼±ÅÃÇÑ°Í º¹»ç"
 
 #: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
@@ -5690,11 +5753,11 @@ msgstr "ÀÚ¸£±â"
 
 #: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
-msgstr ""
+msgstr "¼±ÅÃÇÑ°Í ÀÚ¸§"
 
 #: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
-msgstr ""
+msgstr "XML·Î ´ýÇÁ"
 
 #: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
@@ -5702,7 +5765,7 @@ msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: ÁÖ¼Ò·Ï(_B)..."
 
 #: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
@@ -5710,20 +5773,19 @@ msgstr "°íÄ¥¿¹Á¤: ¼±ÅÃ..."
 
 #: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: À̸§ È®ÀÎ(_k)"
 
 #: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î º¹»ç(_y)..."
 
 #: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:28
-#, fuzzy
 msgid "FIXME: Define Print _Styles"
-msgstr "°íÄ¥¿¹Á¤: Àμâ Çü½Ä Á¤ÀÇ(_S)..."
+msgstr "°íÄ¥¿¹Á¤: Àμâ Çü½Ä Á¤ÀÇ(_S)"
 
 #: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
@@ -5731,7 +5793,7 @@ msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: Æú´õÀÇ Ã¹Â°Ç׸ñ(_r)"
 
 #: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
@@ -5743,16 +5805,15 @@ msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: µµ¿ò¸»"
 
 #: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "°íÄ¥¿¹Á¤: ºÒ¿ÏÀüÇÑ Å½ºÅ©(_c)"
 
 #: po/tmp/evolution-event-editor.xml.h:35
-#, fuzzy
 msgid "FIXME: Insert File"
-msgstr "°íÄ¥¿¹Á¤: »èÁ¦"
+msgstr "°íÄ¥¿¹Á¤: ÆÄÀÏ »ðÀÔ"
 
 #: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
@@ -5788,7 +5849,7 @@ msgstr "°íÄ¥¿¹Á¤: ÷ºÎÆÄÀÏ ÀúÀå..."
 
 #: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: È¥ÀÚ¸» µð¹ö°Å(_D)"
 
 #: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
@@ -5804,20 +5865,19 @@ msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: ÆÄÀÏ(_F)..."
 
 #: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "°íÄ¥¿¹Á¤: ±Û²Ã(_F)..."
 
 #: po/tmp/evolution-event-editor.xml.h:50
-#, fuzzy
 msgid "FIXME: _Formatting"
-msgstr "°íÄ¥¿¹Á¤: ¿¬°á(_C)"
+msgstr "°íÄ¥¿¹Á¤: Çü½Ä(_F)"
 
 #: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: Ç׸ñ(_I)"
 
 #: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
@@ -5853,11 +5913,11 @@ msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: µµÇ¥(_P)..."
 
 #: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
-msgstr ""
+msgstr "°íÄ¥¿¹Á¤: öÀÚ(_S)..."
 
 #: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
@@ -5876,17 +5936,17 @@ msgid "FIXME: what goes here?"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "Çü½Ä(_o)"
 
 #: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
-msgstr ""
+msgstr "´Ù½Ã ã±â"
 
 #: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
-msgstr ""
+msgstr "´Ù½Ã ã±â(_A)"
 
 #: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
@@ -5901,56 +5961,48 @@ msgid "Modify the file's properties"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:73
-#, fuzzy
 msgid "N_ext"
-msgstr "´ÙÀ½"
+msgstr "´ÙÀ½(_e)"
 
 #: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "ºÙÀ̱â"
 
 #: po/tmp/evolution-event-editor.xml.h:76
-#, fuzzy
 msgid "Paste the clipboard"
-msgstr "Ŭ¸³º¸µå¿¡¼­ Ç׸ñÀ» º¹»çÇÕ´Ï´Ù"
+msgstr "Ŭ¸³º¸µå¿¡¼­ ºÙ¿©³Ö±â"
 
 #: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "ÀÌÀü(_v)"
 
 #: po/tmp/evolution-event-editor.xml.h:78
-#, fuzzy
 msgid "Previous"
-msgstr "ÀÌÀü(_v)"
+msgstr "ÀÌÀü"
 
 #: po/tmp/evolution-event-editor.xml.h:79
-#, fuzzy
 msgid "Print S_etup..."
-msgstr "Àμâ..."
+msgstr "Àμ⠼³Á¤(_e)..."
 
 #: po/tmp/evolution-event-editor.xml.h:80
-#, fuzzy
 msgid "Print Setup"
-msgstr "ÂÊ ¼³Á¤(_u)"
+msgstr "Àμ⠼³Á¤"
 
 #: po/tmp/evolution-event-editor.xml.h:83
-#, fuzzy
 msgid "Properties"
-msgstr "¼³Á¤..."
+msgstr "¼³Á¤"
 
 #: po/tmp/evolution-event-editor.xml.h:84
-#, fuzzy
 msgid "Redo"
-msgstr "Á¦°Å"
+msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:86
-#, fuzzy
 msgid "Replace"
-msgstr "´äÀå"
+msgstr "¹Ù²Ù±â"
 
 #: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
@@ -5961,10 +6013,9 @@ msgid "Save the appointment and close the dialog box"
 msgstr "¾à¼ÓÀ» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
 
 #: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Save the current file"
-msgstr "¼­¸í ÆÄÀÏ:"
+msgstr "ÇöÀç ÆÄÀÏÀ» ÀúÀå"
 
 #: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
@@ -5987,67 +6038,60 @@ msgid "Search for a string"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:99
-#, fuzzy
 msgid "Select All"
-msgstr "Æú´õ ¼±ÅÃ"
+msgstr "ÀüºÎ ¼±ÅÃ"
 
 #: po/tmp/evolution-event-editor.xml.h:100
-#, fuzzy
 msgid "Select everything"
-msgstr "Æú´õ ¼±ÅÃ"
+msgstr "Àüü¸¦ ¼±ÅÃÇÕ´Ï´Ù"
 
 #: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:102
-#, fuzzy
 msgid "Undo"
-msgstr "Á¤·Ä¾ÊÇÔ"
+msgstr "½ÇÇàÃë¼Ò"
 
 #: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "_About..."
-msgstr "Evolution˼(_A)..."
+msgstr "ÀÌ ÇÁ·Î±×·¥Àº(_A)..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:39
 msgid "_Close"
-msgstr "´Ý±â"
+msgstr "´Ý±â(_C)"
 
 #: po/tmp/evolution-event-editor.xml.h:106
-#, fuzzy
 msgid "_Copy"
-msgstr "º¹»ç"
+msgstr "º¹»ç(_C)"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:41
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
-msgstr "¼öÁ¤(_E)..."
+msgstr "¼öÁ¤(_E)"
 
 #: po/tmp/evolution-event-editor.xml.h:111
-#, fuzzy
 msgid "_Find..."
-msgstr "ã±â..."
+msgstr "ã±â(_F)..."
 
 #: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "Çü½Ä(_F)"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "µµ¿ò¸»(_H)"
 
@@ -6060,38 +6104,32 @@ msgid "_Object"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:116
-#, fuzzy
 msgid "_Paste"
-msgstr "ºÙÀ̱â"
+msgstr "ºÙÀ̱â(_P)"
 
 #: po/tmp/evolution-event-editor.xml.h:117
-#, fuzzy
 msgid "_Print"
-msgstr "Àμâ"
+msgstr "Àμâ(_P)"
 
 #: po/tmp/evolution-event-editor.xml.h:118
-#, fuzzy
 msgid "_Properties..."
-msgstr "¼³Á¤..."
+msgstr "¼³Á¤(_P)..."
 
 #: po/tmp/evolution-event-editor.xml.h:119
-#, fuzzy
 msgid "_Redo"
-msgstr "º¸³¿(_S)"
+msgstr "Àç½ÇÇà(_R)"
 
 #: po/tmp/evolution-event-editor.xml.h:120
-#, fuzzy
 msgid "_Replace..."
-msgstr "¿­±â(_O)..."
+msgstr "¹Ù²Ù±â(_R)..."
 
 #: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "µµ±¸(_T)"
 
 #: po/tmp/evolution-event-editor.xml.h:124
-#, fuzzy
 msgid "_Undo"
-msgstr "º¸³¿(_S)"
+msgstr "½ÇÇàÃë¼Ò(_U)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -6126,171 +6164,172 @@ msgid "Forget _Passwords"
 msgstr ""
 
 #: po/tmp/evolution-mail.xml.h:20
-#, fuzzy
 msgid "Get Mail"
 msgstr "ÆíÁö ¹Þ±â"
 
-#: po/tmp/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Mail _Filters"
-msgstr "ÆíÁö ÇÊÅÍ(_F)..."
-
 #: po/tmp/evolution-mail.xml.h:22
-#, fuzzy
-msgid "Manage Subscriptions"
-msgstr "¼³¸í:"
+msgid "Hide _Deleted messages"
+msgstr "»èÁ¦µÈ ¸Þ¼¼Áö ¼û±è(_D)"
 
 #: po/tmp/evolution-mail.xml.h:23
-#, fuzzy
-msgid "Mar_k As Read"
-msgstr "¸ðµÎ ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_M)"
+msgid "Hide _Read messages"
+msgstr "ÀÐÀº ¸Þ¼¼Áö ¼û±è(_R)"
 
 #: po/tmp/evolution-mail.xml.h:24
-#, fuzzy
-msgid "Mark As U_nread"
-msgstr "¸ðµÎ ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_M)"
+msgid "Hide _Selected messages"
+msgstr "¼±ÅÃµÈ ¸Þ¼¼Áö ¼û±è(_S)"
 
 #: po/tmp/evolution-mail.xml.h:25
+msgid "Mail _Filters..."
+msgstr "ÆíÁö °Å¸£°³(_F)..."
+
+#: po/tmp/evolution-mail.xml.h:26
+msgid "Manage Subscriptions..."
+msgstr "±¸µ¶ °ü¸®..."
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Mar_k As Read"
+msgstr "ÀÐÀº°ÍÀ¸·Î Ç¥½Ã(_k)"
+
+#: po/tmp/evolution-mail.xml.h:28
+msgid "Mark As U_nread"
+msgstr "ÀÐÁö ¾ÊÀº°ÍÀ¸·Î Ç¥½Ã(_n)"
+
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "À̵¿"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î À̵¿ÇÕ´Ï´Ù"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
-msgstr "Àμ⠹̸®º¸±â"
+msgstr "¸Þ¼¼Áö Àμ⠹̸®º¸±â..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Print message..."
-msgstr "¸Þ¼¼Áö Àμâ(_P)"
+msgstr "¸Þ¼¼Áö Àμâ..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "¸ðµÎ ´äÀå(_A)"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "º¸³½ÀÌ¿¡°Ô ´äÀå(_S)"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
-msgstr "Æú´õ ¼±ÅÃ"
+msgstr "ÀüºÎ ¼±ÅÃ(_A)"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:45
+msgid "Show _All messages"
+msgstr "¸ðµç ¸Þ¼¼Áö º¸±â(_A)"
+
+#: po/tmp/evolution-mail.xml.h:46
 msgid "Threaded Message list"
-msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
+msgstr "¿¬°üµÈ ¸Þ¼¼Áö ¸ñ·Ï"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Apply Filters"
-msgstr "ÆíÁö ÇÊÅÍ(_F)..."
+msgstr "°Å¸£°³ Àû¿ë(_A)"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "Æú´õ ¼³Á¤(_C)"
 
-#: po/tmp/evolution-mail.xml.h:47
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
+msgstr "Æú´õ·Î º¹»ç(_C)..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "¸Þ¼¼Áö ÆíÁý(_E)"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "Á¦°Å(_E)"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "Àü´Þ(_F)"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
-msgstr ""
+msgstr "¼±Åà ¹ÝÀü(_I)"
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration"
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Message"
-msgstr ""
+msgstr "¸Þ¼¼Áö(_M)"
 
-#: po/tmp/evolution-mail.xml.h:56
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
-msgstr "°íÄ¥¿¹Á¤: Æú´õ·Î À̵¿(_M)..."
+msgstr "Æú´õ·Î À̵¿(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Open in New Window"
-msgstr ""
+msgstr "»õ â¿¡¼­ ¿­±â(_O)"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "¸Þ¼¼Áö Àμâ(_P)"
 
-#: po/tmp/evolution-mail.xml.h:59
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Save Message As..."
-msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå(_S)..."
+msgstr "´Ù¸¥ À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå(_S)..."
 
-#: po/tmp/evolution-mail.xml.h:60
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Source"
-msgstr "¹è¿ìÀÚ(_S):"
+msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_Undelete"
-msgstr "»èÁ¦(_D)"
+msgstr "µÇ»ì¸²(_U)"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:69
+msgid "_Virtual Folder Editor..."
+msgstr "°¡»ó Æú´õ ÆíÁý±â(_V)..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -6302,101 +6341,112 @@ msgstr "÷ºÎ"
 
 #: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
-msgstr ""
+msgstr "ÇöÀç ÆÄÀÏ ´ÝÀ½"
 
-#: po/tmp/evolution-message-composer.xml.h:11
-msgid "HTML"
-msgstr ""
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "Encrypt this message with PGP"
+msgstr "ÀÌ ¸Þ¼¼Áö¸¦ PGP·Î ¾ÏȣȭÇÕ´Ï´Ù"
 
 #: po/tmp/evolution-message-composer.xml.h:12
-msgid "Insert a file as text into the message"
+msgid "HTML"
 msgstr ""
 
 #: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert a file as text into the message"
+msgstr "¸Þ¼¼Áö¿¡ ÅؽºÆ®·Î ÆÄÀÏÀ» »ðÀÔÇÕ´Ï´Ù"
+
+#: po/tmp/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
-msgstr ""
+msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
 
-#: po/tmp/evolution-message-composer.xml.h:15
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Open a file"
-msgstr "´Þ·ÂÀ» ¿±´Ï´Ù"
+msgstr "ÆÄÀÏÀ» ¿±´Ï´Ù"
 
 #: po/tmp/evolution-message-composer.xml.h:17
-#, fuzzy
+msgid "PGP Encrypt"
+msgstr "PGP ¾Ïȣȭ"
+
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr "PGP ¼­¸í"
+
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save As"
-msgstr "ÀúÀå"
+msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå"
 
-#: po/tmp/evolution-message-composer.xml.h:19
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
-msgstr "Æú´õ·Î ÀúÀå(_f)..."
+msgstr "Æú´õ·Î ÀúÀå(_f)... (°íÄ¥¿¹Á¤)"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
-msgstr "Æú´õ·Î ÀúÀå(_f)..."
+msgstr "Æú´õ·Î ÀúÀå..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
-msgstr ""
+msgstr "ÇöÀç ÆÄÀÏÀ» ´Ù¸¥À̸§À¸·Î ÀúÀåÇÕ´Ï´Ù"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "¸Þ¼¼Áö¸¦ ÁöÁ¤ÇÑ Æú´õ·Î ÀúÀåÇÕ´Ï´Ù"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "º¸³¿"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send _Later"
-msgstr ""
+msgstr "³ªÁß¿¡ º¸³¿(_L)"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send _later"
-msgstr ""
+msgstr "³ªÁß¿¡ º¸³¿(_l)"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
-msgstr ""
+msgstr "ÆíÁö¸¦ HTMLÇü½ÄÀ¸·Î º¸³¿"
 
-#: po/tmp/evolution-message-composer.xml.h:28
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Send the message later"
-msgstr "¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
 
-#: po/tmp/evolution-message-composer.xml.h:29
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Send the message now"
-msgstr "¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+msgstr "Áö±Ý ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
 
-#: po/tmp/evolution-message-composer.xml.h:30
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Send this message now"
-msgstr "ÀÌ ¸Þ¼¼Áö¸¦ º¸³¿"
+msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³À´Ï´Ù"
 
-#: po/tmp/evolution-message-composer.xml.h:31
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
-msgstr "÷ºÎ¹°À» º¸°Å³ª ¼û±é´Ï´Ù"
+msgstr "÷ºÎ¹° º¸ÀÓ/¼û±è"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "÷ºÎ¹° º¸±â(_a)"
 
-#: po/tmp/evolution-message-composer.xml.h:33
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "÷ºÎ¹° º¸±â(_a)"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-message-composer.xml.h:37
+msgid "Sign this message with your PGP key"
+msgstr "À̸޼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
+
+#: po/tmp/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: po/tmp/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "¿­±â(_O)..."
 
+#: po/tmp/evolution-message-composer.xml.h:47
+msgid "_Security"
+msgstr "º¸¾È(_S)"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -6419,11 +6469,11 @@ msgstr ""
 
 #: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
-msgstr ""
+msgstr "±¸µ¶"
 
 #: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
-msgstr ""
+msgstr "±¸µ¶ ÁßÁö"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -6431,12 +6481,11 @@ msgstr ""
 #.
 #: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
-msgstr ""
+msgstr "´Ù¸¥ Æú´õ¸¦ Ç¥½Ã"
 
 #: po/tmp/evolution.xml.h:7
-#, fuzzy
 msgid "E_xit"
-msgstr "Á¾·á(_x)..."
+msgstr "Á¾·á(_x)"
 
 #: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
@@ -6444,35 +6493,31 @@ msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
 
 #: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
-msgstr ""
+msgstr "ÇÁ·Î±×·¥À» ¸¶Ä¨´Ï´Ù"
 
 #: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
-msgstr ""
+msgstr "½ÃÀÛÇϱâ"
 
 #: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
-msgstr ""
+msgstr "EvolutionÀÇ Á¤º¸ º¸±â"
 
 #: po/tmp/evolution.xml.h:12
-#, fuzzy
 msgid "Show the _Folder Bar"
 msgstr "Æú´õ ¸·´ë º¸±â(_F)"
 
 #: po/tmp/evolution.xml.h:13
-#, fuzzy
 msgid "Show the _Shortcut Bar"
 msgstr "´ÜÃà ¸·´ë º¸±â(_S)"
 
 #: po/tmp/evolution.xml.h:14
-#, fuzzy
 msgid "Submit _Bug Report"
-msgstr "¹ö±× Á¦º¸(_S)"
+msgstr "¹ö±× Á¦º¸(_B)"
 
 #: po/tmp/evolution.xml.h:15
-#, fuzzy
 msgid "Submit bug report using Bug Buddy."
-msgstr "bug-buddy·Î ¹ö±×Á¦º¸¸¦ ÇÕ´Ï´Ù"
+msgstr "Bug Buddy·Î ¹ö±×Á¦º¸¸¦ ÇÕ´Ï´Ù"
 
 #: po/tmp/evolution.xml.h:16
 #, fuzzy
@@ -6490,7 +6535,7 @@ msgstr ""
 
 #: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
-msgstr ""
+msgstr "´Þ·Â »ç¿ëÇϱâ(_C)"
 
 #: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
@@ -6514,12 +6559,11 @@ msgstr "Æú´õ(_F)"
 
 #: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
-msgstr ""
+msgstr "Æú´õ·Î °¡±â(_G)..."
 
 #: po/tmp/evolution.xml.h:29
-#, fuzzy
 msgid "_Index"
-msgstr "µµ¿ò¸» »öÀÎ(_I)"
+msgstr "»öÀÎ(_I)"
 
 #: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
@@ -6536,7 +6580,7 @@ msgstr "ÀÛ¾÷(_T) (°íÄ¥¿¹Á¤)"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -6578,7 +6622,7 @@ msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 msgid "_<<"
-msgstr "_<<"
+msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
@@ -6586,7 +6630,7 @@ msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
-msgstr ">_>"
+msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 msgid "_All People and Resources"
@@ -6616,29 +6660,35 @@ msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
 msgid "All Attendees"
 msgstr "¸ðµç Âü¼®ÀÚ"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
-msgstr "..."
+msgstr ""
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "»õ ¿¬¶ôó"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6646,142 +6696,3 @@ msgstr ""
 #, c-format
 msgid "Group %i"
 msgstr "±×·ì %i"
-
-#~ msgid "Could not start addressbook server"
-#~ msgstr "ÁÖ¼Ò·Ï ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
-
-#~ msgid "Error while communicating with address server"
-#~ msgstr "ÁÖ¼Ò·Ï ¼­¹ö¿Í Åë½ÅÀ» ÇÏ´Â µµÁß ¿À·ù¹ß»ý"
-
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "°íÄ¥¿¹Á¤: ¾à¼Ó(_A)"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "°íÄ¥¿¹Á¤: ȸÀÇ ¿äû(_q)"
-
-#~ msgid "Ne_xt"
-#~ msgstr "´ÙÀ½(_x)"
-
-#~ msgid "Insert a file as an attachment"
-#~ msgstr "÷ºÎ·Î¼­ ÆÄÀÏÀ» »ðÀÔÇÑ´Ù"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Á¤¸»·Î ÀÌ ¿¬¶ôó¸¦\n"
-#~ "Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
-
-#~ msgid "_New Contact"
-#~ msgstr "»õ ¿¬¶ôó(_N)"
-
-#~ msgid "_New appointment..."
-#~ msgstr "»õ ¾à¼Ó(_N)"
-
-#~ msgid "FIXME: _Delete"
-#~ msgstr "°íÄ¥¿¹Á¤: »èÁ¦(_D)"
-
-#~ msgid "FIXME: _New Task"
-#~ msgstr "°íÄ¥¿¹Á¤: »õ ŽºÅ©(_N)"
-
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "°íÄ¥¿¹Á¤: ¸ðµÎ ´äÀå"
-
-#~ msgid "S_ubject:"
-#~ msgstr "Á¦¸ñ(_u):"
-
-#~ msgid "Owner:"
-#~ msgstr "¼ÒÀ¯ÀÚ:"
-
-#~ msgid "Save this appointment"
-#~ msgstr "ÀÌ ¾à¼ÓÀ» ÀúÀåÇÕ´Ï´Ù"
-
-#~ msgid "Priority:"
-#~ msgstr "¿ì¼±¼øÀ§:"
-
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "¼±ÅÃÇÑ Ç׸ñÀ» Ŭ¸³º¸µå·Î ÀÚ¸¨´Ï´Ù"
-
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "¼±ÅÃÇÑ Ç׸ñÀ» Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù"
-
-#~ msgid "Select recipients' addresses"
-#~ msgstr "¹ÞÀ» »ç¶÷ÀÇ ÁÖ¼Ò ¼±ÅÃ"
-
-#~ msgid "Search..."
-#~ msgstr "°Ë»ö..."
-
-#~ msgid "Name"
-#~ msgstr "À̸§"
-
-#~ msgid "To: >>"
-#~ msgstr "¹Þ´Â»ç¶÷: >>"
-
-#~ msgid "Cc: >>"
-#~ msgstr "ÂüÁ¶: >>"
-
-#~ msgid "_Save..."
-#~ msgstr "ÀúÀå(_S)..."
-
-#~ msgid "_Close..."
-#~ msgstr "´Ý±â(_C)..."
-
-#~ msgid "_Format"
-#~ msgstr "Çü½Ä(_F)"
-
-#~ msgid "Check for new mail"
-#~ msgstr "»õ ÆíÁö¸¦ È®ÀÎÇÕ´Ï´Ù"
-
-#~ msgid "_Delete Message"
-#~ msgstr "¸Þ¼¼Áö »èÁ¦(_D)"
-
-#~ msgid "_Move Message"
-#~ msgstr "¸Þ¼¼Áö À̵¿(_M)"
-
-#~ msgid "_Delete all"
-#~ msgstr "¸ðµÎ »èÁ¦(_D)"
-
-#~ msgid "Port:"
-#~ msgstr "Æ÷Æ®:"
-
-#~ msgid "From"
-#~ msgstr "º¸³½ »ç¶÷"
-
-#~ msgid "To"
-#~ msgstr "¹Þ´ÂÀÌ"
-
-#~ msgid "Size"
-#~ msgstr "Å©±â"
-
-#~ msgid "Create a new note"
-#~ msgstr "»õ ³ëÆ® »ý¼º"
-
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "³ëÆ® ÄÄÆ÷³ÍÆ®: Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#~ msgid "Open Mime Message"
-#~ msgstr "¸¶ÀÓ ¸Þ½ÃÁö ¿­±â"
-
-#~ msgid "Fields"
-#~ msgstr "Çʵå"
-
-#~ msgid "Field Chooser"
-#~ msgstr "ÇÊµå ¼±Åñâ"
-
-#~ msgid "Available fields"
-#~ msgstr "°¡´ÉÇÑ Çʵå"
-
-#~ msgid "Show in this order"
-#~ msgstr "ÀÌ ¼ø¼­·Î º¸±â"
-
-#~ msgid "Add >>"
-#~ msgstr "Ãß°¡ >>"
-
-#~ msgid "<< Remove"
-#~ msgstr "<< Á¦°Å"
-
-#~ msgid "Group By Box"
-#~ msgstr "»óÀÚ·Î ¹­±â"
-
-#~ msgid "Alignment"
-#~ msgstr "Á¤·Ä"