Update po files to speed up snap build.

svn path=/trunk/; revision=17769

1 files changed, 2129 insertions, 1733 deletions

diff --git a/po/ko.po b/po/ko.po
index c9d4874a8e..1aae1bc693 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-03-23 02:12+0900\n"
 "Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "GnomeCard ÆÄÀÏÀ» EvolutionÀ¸·Î °¡Á®¿É´Ï´Ù"
 msgid "File As"
 msgstr "ÆÄÀÏ·Î ÀúÀå:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "À̸§"
@@ -367,54 +367,54 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "°Ë»ö"
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "±â´Ù¸®´Â Áß ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "ã±â¸¦ ¼öÇ൵Áß ¿À·ù: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "´Þ·Â ºÒ·¯¿À±â..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr ""
 "ÀÚ·áÀ» ÀдÂÁß ¿À·ù ¹ß»ý:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
@@ -507,11 +507,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 #, fuzzy
 msgid "Contacts"
 msgstr "¿¬¶ôó(_C)"
@@ -529,26 +529,35 @@ msgstr "LDAP ¼­¹ö"
 msgid "LDAP server containing contact information"
 msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "New Contact List"
+msgid "New Contact"
 msgstr "»õ ¿¬¶ôó"
 
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
 msgstr "¿¬¶ôó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact"
+msgid "Create a new contact"
+msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
+
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "New Contact List"
 msgstr "»õ ¿¬¶ôó"
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "Contact _List"
 msgstr "¿¬¶ôó(_C)"
 
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -567,27 +576,27 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
@@ -596,18 +605,18 @@ msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
 msgid "Other Contacts"
 msgstr "´Ù¸¥ ¿¬¶ôó"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -615,51 +624,51 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "À̸ÞÀÏ 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "¸ñ·Ï"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "°í±Þ..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "¸ñ·Ï:"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Æú´õ Ž»ö±â°¡ Ç¥½ÃÇÒ URI"
 
@@ -782,7 +791,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "ÁÖ¼Ò·Ï ¼Ò½º"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -876,8 +885,8 @@ msgstr "¸ÞÀÏ ¼³Á¤"
 msgid "Mappings"
 msgstr "¿©¹é"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Á¦°Å"
@@ -929,8 +938,8 @@ msgstr "°Ë»ö ¹üÀ§:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "°Ë»ö"
@@ -1120,15 +1129,15 @@ msgid "Using email address"
 msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Ãß°¡(_A)"
 
@@ -1173,12 +1182,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "¼öÁ¤(_E)"
@@ -1293,10 +1302,10 @@ msgstr "ÁÖ¼Ò·Ï À̸§ ¼±Åà ÀÎÅÍÆäÀ̽º¸¦ À§ÇÑ ÆÑÅ丮"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Á¦°Å"
 
@@ -1329,33 +1338,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "´Ù¸¥ ¿¬¶ôó"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "¿¬¶ôó ã¾Æº»´Ù"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "¼±ÅÃÇÑ À̸§"
@@ -1378,15 +1369,10 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "_Browse..."
-msgstr "À̵¿"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
 msgid "_Category:"
 msgstr "¸ñ·Ï:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "_Folder:"
 msgstr "Æú´õ(_F)"
@@ -1500,11 +1486,12 @@ msgstr "HTMLÇü½Ä ÆíÁö »ç¿ë(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "»èÁ¦(_D)"
 
@@ -2799,7 +2786,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 #, fuzzy
 msgid "_Remove"
 msgstr "Á¦°Å"
@@ -2866,7 +2853,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "°í±Þ °Ë»ö"
 
@@ -2896,22 +2883,22 @@ msgid "Error getting book view"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
 
@@ -2920,8 +2907,8 @@ msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
 msgid "Repository offline"
 msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Çã°¡±Ç °ÅºÎ"
 
@@ -2940,7 +2927,7 @@ msgid "Protocol not supported"
 msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2964,37 +2951,42 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+#, fuzzy
 msgid "Other error"
 msgstr "ÀÔÃâ·Â ¿À·ù"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "º¯°æµÈ°ÍÀ» ÀúÀå ÇÏ±æ ¿øÇϽʴϱî?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 #, fuzzy
 msgid "Error adding list"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 #, fuzzy
 msgid "Error adding card"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 #, fuzzy
 msgid "Error removing list"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
@@ -3002,17 +2994,17 @@ msgstr ""
 "ÀÚ·áÀ» ÀдÂÁß ¿À·ù ¹ß»ý:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Ç¥½Ã"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Ç¥½Ã"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3020,22 +3012,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "½ÃÀÛ ¾ÈÇÔ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "½ÃÀÛ ¾ÈÇÔ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "½ÃÀÛ ¾ÈÇÔ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "½ÃÀÛ ¾ÈÇÔ"
@@ -3121,7 +3113,7 @@ msgstr "ÁÖ¼Ò·Ï Ãß°¡"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard·Î ÀúÀå"
 
@@ -3161,7 +3153,7 @@ msgid "Pilot Settings..."
 msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "´Ù¸¥ ÁÖ¼Ò·Î Àü´Þ"
@@ -3172,8 +3164,8 @@ msgid "Send Message to Contact"
 msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Àμâ"
@@ -3194,7 +3186,7 @@ msgid "Move to folder..."
 msgstr "Æú´õ·Î À̵¿..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ÀÚ¸£±â"
 
@@ -3205,20 +3197,20 @@ msgid "Copy"
 msgstr "º¹»ç"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "ºÙÀ̱â"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "»èÁ¦"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Ä«µå: "
@@ -3379,7 +3371,7 @@ msgstr "¿©¹é"
 msgid "Number of columns:"
 msgstr "¿­ ¼ö:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "¼³Á¤"
 
@@ -3471,26 +3463,26 @@ msgstr "¾à¼ÓÀ» ¼öÁ¤Çϱâ"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "³ôÀÌ"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "º¸Åë"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "³·°Ô"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Á¤ÀǾȵÊ"
@@ -3617,11 +3609,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "¾à¼ÓÀ» ¼öÁ¤Çϱâ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3629,13 +3621,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "°æ°í"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3646,7 +3638,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
@@ -3679,7 +3671,7 @@ msgstr "¼³¸í:"
 msgid "Comment contains"
 msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3690,7 +3682,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3713,17 +3705,17 @@ msgstr "%Y/%m/%d"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3748,7 +3740,7 @@ msgstr "µ¿"
 msgid "W"
 msgstr "¼­"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3756,30 +3748,30 @@ msgstr "ÁÖ"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "¹Ù»Ý"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "½ÃÀÛ ¾ÈÇÔ"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "ÁøÇàÁß"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "¿Ï·áµÊ"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3787,59 +3779,58 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "¹Ýº¹µÊ"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "¿¹¾àµÊ"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "¿¹"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "¾Æ´Ï¿À"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 #, fuzzy
 msgid "Day View"
 msgstr "Ä«µå: "
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 #, fuzzy
 msgid "Week View"
 msgstr "ÁÖ"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 #, fuzzy
 msgid "Month View"
 msgstr "´Þ"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "´Þ·Â"
 
@@ -3847,12 +3838,12 @@ msgstr "´Þ·Â"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "ÀÛ¾÷"
 
@@ -3861,44 +3852,63 @@ msgstr "ÀÛ¾÷"
 msgid "Folder containing to-do items"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "»õ ¾à¼Ó"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "¾à¼Ó"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "ÀÛ¾÷"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 #, fuzzy
-msgid "New All Day Appointment"
-msgstr "»õ ¾à¼Ó"
+msgid "Create a new task"
+msgstr "»õ ´Þ·ÂÀ» ¸¸µì´Ï´Ù"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "All _Day Appointment"
+msgid "New All Day Appointment"
 msgstr "»õ ¾à¼Ó"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "New appointment"
+msgid "All _Day Appointment"
 msgstr "»õ ¾à¼Ó"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "¾à¼Ó"
+msgid "Create a new all-day appointment"
+msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3968,7 +3978,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "³¯"
 
@@ -3977,11 +3988,13 @@ msgstr "³¯"
 msgid "extra times every"
 msgstr "°»½Å ÁÖ±â"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "½Ã"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "ºÐ"
 
@@ -4117,7 +4130,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "¿ä¾à"
 
@@ -4147,7 +4160,7 @@ msgstr "¾à¼Ó ³¡"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "ºÐ"
 
@@ -4337,7 +4350,7 @@ msgid "_Fri"
 msgstr "±Ý"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_General"
 msgstr "ÀÏ¹Ý Á¤º¸"
@@ -4386,21 +4399,35 @@ msgstr "¼ö"
 msgid "before every appointment"
 msgstr "¾à¼Ó ³¡³ª±âÀü"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Á¤¸»·Î ÀÌ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Á¤¸»·Î ¿©ÇàÀÏÁ¤ `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
@@ -4471,61 +4498,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Á¦´ë·Î ÆÄÀϵéÀ» °»½ÅÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Á¦´ë·Î ÆÄÀϵéÀ» °»½ÅÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "¾à¼ÓÀ» ¼öÁ¤ÇÑ´Ù"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "¾à¼Ó - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "¿©Çà ÀÏÁ¤ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4742,7 +4769,7 @@ msgid "Member"
 msgstr "±¸¿ù"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4754,7 +4781,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "»óÅÂ"
@@ -4839,7 +4866,7 @@ msgstr ""
 msgid "first"
 msgstr "¼º(_F):"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "ÃÊ"
 
@@ -4863,7 +4890,7 @@ msgstr "ºÙÀ̱â"
 msgid "Other Date"
 msgstr "±âŸ Æѽº"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
@@ -4963,20 +4990,27 @@ msgstr "% ¿Ï·á(_p):"
 msgid "Date Completed:"
 msgstr "¿Ï·áµÈ ³¯Â¥:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "µ¿ÀÛ Á¦°Å"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "ÁøÇàÁß"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "¿ì¼±¼øÀ§(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "»óÅÂ(_S):"
 
@@ -4991,7 +5025,7 @@ msgstr ""
 msgid "Assignment"
 msgstr "¿¹¾àµÊ"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5060,84 +5094,84 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "¿­±â"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Àμâ(_P)..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ÀÚ¸£±â(_u)"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "º¹»ç(_C)"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "ºÙÀ̱â(_P)"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "¿¹¾àµÊ"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "´Þ·Â ºÒ·¯µéÀ̱â"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "¿Ï·á Ç¥½Ã"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "¿Ï·á Ç¥½Ã"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5147,8 +5181,8 @@ msgstr "ÀÛ¾÷¸ñ·Ï¿¡ Ãß°¡Çϱâ"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 #, fuzzy
 msgid "Complete"
 msgstr "¿Ï·áµÊ"
@@ -5177,11 +5211,9 @@ msgstr "¿ì¼±¼øÀ§"
 msgid "Start Date"
 msgstr "½ÃÀÛÇÑ ³¯"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "¿ä¾à"
 
@@ -5221,115 +5253,114 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "¿ÀÀü"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "¿ÀÈÄ"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 #, fuzzy
 msgid "New _Appointment"
 msgstr "»õ ¾à¼Ó"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Àμâ..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "¿À´Ã·Î À̵¿(_T)"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "³¯Â¥·Î À̵¿..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "¸ÞÀÏ ¼³Á¤"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "¸ÞÀÏ ¼³Á¤"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_S)..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "¸í¾Ï"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "´Þ·Â ºÒ·¯µéÀ̱â"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "ÇöÀç ÆÄÀÏÀ» ÀúÀå"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
@@ -5379,7 +5410,7 @@ msgstr "¿Ï·áµÊ"
 msgid "Task Due: <b>"
 msgstr "¿Ï·áµÊ"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
@@ -5390,366 +5421,373 @@ msgstr "»ç¿ëÀÚ Á¤º¸"
 msgid "iCalendar Error"
 msgstr "´Þ·Â"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Áö¸®Àû À§Ä¡: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "»óÅÂ(_S):"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "½ÂÀÎ"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "ÀáÁ¤Àû"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "¹Ý´ë"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "ÀÛ¾÷"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "½ÂÀÎ"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "ÀáÁ¤Àû"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "¹Ý´ë"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Ãë¼ÒµÊ"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Á¤º¸ ¾øÀ½"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "ÀÛ¾÷Æеå"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "ÀÛ¾÷"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "ÀÛ¾÷"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "ȸ½Å"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy¸¦ ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "¿Ï·áµÈ ³¯Â¥:"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Âü¼®ÀÚ ÁÖ¼Ò"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Âü¼®ÀÚ ÁÖ¼Ò"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% ¿Ï·á(_p):"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "º¸³½ ³¯Â¥"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Æú´õ ¼±ÅÃ"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Æú´õ ¼±ÅÃ"
@@ -5796,7 +5834,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "ÇÊ Âü¼®ÀÚ"
@@ -5812,60 +5850,54 @@ msgid "Non-Participants"
 msgstr "ÇÊ Âü¼®ÀÚ"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "±×·ì À̸§:"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "±ÞÁö¹æ¹ý:"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "ÁËÀå"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "ÇÊ Âü¼®ÀÚ"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "µ¿ÀÛ Á¦°Å"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "ÀáÁ¤Àû"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "»èÁ¦µÊ"
@@ -5957,51 +5989,47 @@ msgstr "ȸÀÇ ½ÃÀÛ ½Ã°£(_s):"
 msgid "Meeting _end time:"
 msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "%s Æú´õ¸¦ ¿­±â"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'¿¡ÀÖ´Â Æú´õ¸¦ ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "¿Ï·á ³¯Â¥"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Æú´õ ºñ¿ì±â"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "»õ ¾à¼Ó..."
 
-#: calendar/gui/e-week-view.c:3489
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -6012,11 +6040,16 @@ msgstr "`%s'¿¡ÀÖ´Â Æú´õ¸¦ ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "´Þ·Â ¿­±â"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s Æú´õ¸¦ ¿­±â"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6074,58 +6107,63 @@ msgstr "½Ã¿ù"
 msgid "September"
 msgstr "±¸¿ù"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Á¤º¸"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Á¤º¸ ¾øÀ½"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "ÀÛ¾÷"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "¿¬µµ"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "¾Ë¶÷ ±â´É ÆÑÅ丮¸¦ ¸¸µé¼ö°¡ ¾ø½À´Ï´Ù"
@@ -6357,9 +6395,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Àμ⠹̸®º¸±â"
 
@@ -6389,8 +6426,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
@@ -6447,128 +6484,140 @@ msgstr "GnomeCard ÆÄÀÏÀ» EvolutionÀ¸·Î °¡Á®¿É´Ï´Ù"
 msgid "Imports vCalendar files into Evolution"
 msgstr "GnomeCard ÆÄÀÏÀ» EvolutionÀ¸·Î °¡Á®¿É´Ï´Ù"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %2$s Æú´õ¿¡¼­ %1$s\n"
+"  %3$s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "º¸³½ÀÌ"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "´Þ·Â"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "´Þ·Â ¿­±â"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8188,79 +8237,89 @@ msgstr "%s Æú´õ¸¦ ¿­±â"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Æú´õ µ¿±âÈ­"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÇÊÅÍ ºÐ¼®Áß ¿À·ù: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "¸Þ¼¼Áö %s¸¦ °¡Á®¿À±â"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Æú´õ µ¿±âÈ­"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "÷ºÎ"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "÷ºÎ"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÇÊÅÍ Ã£±â ½ÇÇàÁß ¿À·ù: %s: %s"
@@ -8319,7 +8378,7 @@ msgstr "¸Þ¼¼Áö º¹»ç"
 msgid "Copying messages"
 msgstr "¸Þ½ÃÁöµéÀ» %s·Î º¹»ç"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8327,46 +8386,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Ãë¼ÒµÊ."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "IMAP server·ÎºÎÅÍ ¿¹»óÄ¡¸øÇÑ ´äº¯: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö¾ÊÀ½"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8374,18 +8433,18 @@ msgid ""
 "%.*s"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
@@ -8411,22 +8470,22 @@ msgid "Could not lock '%s'"
 msgstr "`%s'¿ë Àá±ÝÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "`%s'¿ë Àá±ÝÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8485,11 +8544,15 @@ msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8610,7 +8673,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8785,26 +8848,130 @@ msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+"Ãâ·ÂÆÄÀÏÀ» »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù: %s\n"
+" %s"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "¼­¸í ÆÄÀÏ:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "»ç¹«½Ç ¶°³²"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "÷ºÎ"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8813,16 +8980,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8837,32 +9016,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
+
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½: %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
@@ -8870,12 +9054,12 @@ msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "ÀÛ¾÷ Ãë¼Ò"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8904,42 +9088,42 @@ msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ¼­¹ö·ÎºÎÅÍ ¿¹°ßÄ¡¸øÇÑ OK´äº¯ÀÌ ¿È: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "ÀÌ ¸Þ½ÃÁö´Â ÇöÀç º¸¿©ÁÙ ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8950,10 +9134,10 @@ msgstr ""
 "%s µð·ºÅ丮¸¦ »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
@@ -8968,7 +9152,7 @@ msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 msgid "Check for new messages in all folders"
 msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Æú´õ"
 
@@ -8999,7 +9183,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "ºñ¹Ð¹øÈ£"
 
@@ -9007,71 +9191,75 @@ msgstr "ºñ¹Ð¹øÈ£"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ¼­¹ö %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP ¼­¹ö %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "¿¬°áÀÌ Ãë¼ÒµÊ"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "ÀÎÁõ ½ÇÆÐ."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s ŸÀÔ ÀÎÁõÀ» Áö¿ø ¾ÈÇÔ"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9079,31 +9267,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "%s°°Àº Æú´õ°¡ ¾øÀ½"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s ´º½º ¼­¹ö %s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s ´º½º ¼­¹ö %s"
@@ -9126,7 +9320,9 @@ msgid "Local delivery"
 msgstr "°¡»ó Æú´õ"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9153,12 +9349,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9169,40 +9365,40 @@ msgstr ""
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 "¼­¸í ÆÄÀÏ %sÀ» ¿­ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9263,7 +9459,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9303,26 +9499,26 @@ msgstr ""
 "Æú´õ `%s'¸¦ ¸¸µé¼ö ¾øÀ½:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "¸ÞÀÏÆú´õ¿¡ ¸Þ¼¼Áö¸¦ µ¡ºÙÀϼö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9368,35 +9564,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9413,13 +9609,13 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9427,52 +9623,52 @@ msgstr ""
 "¼­¸í ÆÄÀÏ %sÀ» ¿­ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9624,51 +9820,51 @@ msgstr "Ãë¼ÒµÊ"
 msgid "Operation failed: %s"
 msgstr "ÀÛ¾÷ Ãë¼Ò"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP ¿ä¾àÀ» °¡Á®¿È"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "ÀÛ¾÷ Ãë¼Ò"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ¸Þ¼¼Áö %d¸¦ °¡Á®¿È"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
@@ -9688,7 +9884,7 @@ msgstr "¼­¹ö¿¡ ¸ÞÀÏ ³²±â±â"
 msgid "Delete after %s day(s)"
 msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr ""
 
@@ -9709,6 +9905,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9718,50 +9919,52 @@ msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "%s ŸÀÔ ÀÎÁõÀ» Áö¿ø ¾ÈÇÔ"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ¸í·ÉÀÌ ½ÇÆÐ: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "ÀÔÃâ·Â ¿À·ù"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9786,35 +9989,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmailÀ» ÅëÇÑ ¸ÞÀÏ Àü´Þ"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -9922,41 +10125,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr "ÀÎÁõÀÌ ÇÊ¿äÇÔ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s ŸÀÔ ÀÎÁõÀ» Áö¿ø ¾ÈÇÔ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9964,89 +10166,89 @@ msgid ""
 "\n"
 msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ¼­¹ö %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "ÀÔÃâ·Â ¿À·ù"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "ÀÎÁõ:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10054,86 +10256,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 ¹ÙÀÌÆ®"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u ¹ÙÀÌÆ®"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "÷ºÎ"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "÷ºÎÆÄÀÏ ¸ñ·Ï¿¡¼­ ¼±ÅÃÇÑ Ç׸ñÀ» Á¦°ÅÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "÷ºÎÆÄÀÏ Ãß°¡..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "¿ä°ÅÀÌ º¸Åë ÆÄÀÏÀÌ ¾Æ´Ï³×¿ä."
@@ -10151,107 +10353,119 @@ msgid "MIME type:"
 msgstr "MIME Çü½Ä:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "ÁÖ¼Ò·Ï"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "º¸³½ »ç¶÷:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "ȸ½Å ÁÖ¼Ò:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "º¸³½ »ç¶÷:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Á¦¸ñ:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "¹Þ´Â »ç¶÷:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "¸Þ¼¼Áö¸¦ ¹ÞÀ» »ç¶÷À» ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "ÂüÁ¶:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷ÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "¼ûÀº ÂüÁ¶:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 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-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Æ÷Æ®:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 #, fuzzy
 msgid "Warning!"
 msgstr "°æ°í"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10260,7 +10474,7 @@ msgstr ""
 "Ãâ·ÂÆÄÀÏÀ» »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10269,7 +10483,7 @@ msgstr ""
 "Ãâ·ÂÆÄÀÏÀ» »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10278,13 +10492,13 @@ msgstr ""
 "%s·Î ¸Þ½ÃÁö ÀúÀåÁß ¿À·ù ¹ß»ý:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10294,50 +10508,45 @@ msgstr ""
 "\n"
 "º¯°æµÈ ³»¿ëÀ» ÀúÀåÇϽðڽÀ´Ï±î?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "ÆÄÀÏ ¿­±â"
 
-#: composer/e-msg-composer.c:1569
-#, fuzzy
-msgid "Insert File"
-msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "¼­¸í:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr ""
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "¸ÞÀÏ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10346,9 +10555,9 @@ msgstr ""
 "¾ÆÁ÷ ½Å»ó Á¤º¸°¡ ÀÔ·ÂÀÌ µÇ¾îÀÖÁö ¾Ê¾Ò±â¶§¹®¿¡\n"
 "¸Þ½ÃÁö ÀÛ¼ºÃ¢À» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10424,19 +10633,18 @@ msgstr "Æ÷ÇÔ"
 msgid "Subject does not contain"
 msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10543,145 +10751,102 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "¿¬µµ"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "¿¬µµ"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "ÃÊ"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "´Þ"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "ºÐ"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "´Þ"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "½Ã"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "ÁÖ"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "ÁÖ"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "½Ã"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "´Þ"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "ºÐ"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "´Þ"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "ÃÊ"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "¿¬µµ"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "¿¬µµ"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 #, fuzzy
 msgid "You have forgotten to choose a date."
 msgstr "Çì. ³¯Â¥ ¼±ÅÃÇØ¾ß ÇÏ´Â°É ÀØÀ¸¼ÌÁÒ:-)"
 
-#: filter/filter-datespec.c:196
-#, fuzzy
-msgid "You have chosen an invalid date."
-msgstr "ÂÁ. °í¸¥ ³¯Â¥°¡ ÀûÇÕÇÏÁö¾Ê³×¿ä."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<³¯Â¥¸¦ ¼±ÅÃÇÒ·Á¸é ¿©±æ ´©¸£¼¼¿ä>"
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "ÇöÀç ½Ã°¢"
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "ÇöÀç"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y/%m/%d"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "ÇöÀç"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<³¯Â¥¸¦ ¼±ÅÃÇÒ·Á¸é ¿©±æ ´©¸£¼¼¿ä>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "°Å¸£°³ ±ÔÄ¢"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Çü½Ä À̸§:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "µ¿ÀÛ ¼±ÅÃ"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "µ¿ÀÛ Ãß°¡"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -10690,12 +10855,12 @@ msgstr ""
 "ÂÁ, Æú´õ °í¸£´Â °ÍÀ» ÀØÀ¸¼Ì³×¿ä.\n"
 "µÚ·Î µ¹¾Æ°¡ ¸ÞÀÏÀ» ¹è´ÞÇÒ Æú´õ¸¦ ÁöÁ¤Çϼ¼¿ä."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Æú´õ ¼±ÅÃ"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10704,95 +10869,159 @@ msgstr ""
 "Á¤±Ô½Ä '%s'¿¡¼­ ¿¡·¯:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Áß¿ä"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "ÁÖ"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "¹Þ´Â»ç¶÷"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "³¯Â¥"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Å×½ºÆ®"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "ºä¸¦ %s·Î º¯°æ"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "±ÔÄ¢ À̸§: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Á¦¸ñ¾øÀ½"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Á¶°Ç ¼±ÅÃ"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "µ¿ÀÛ ¼±ÅÃ"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "¸ðµç Á¶°ÇÀÌ ´Ù ÃæÁ·µÉ ¶§"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "¾î¶² Á¶°ÇÀÌ¶óµµ ÃæÁ·µÉ ¶§"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Á¶°Ç Ãß°¡"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "incoming"
 msgstr "µé¾î¿À´Â°Å"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "outgoing"
 msgstr "³ª°¡´Â°Å"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "°Å¸£°Ô ÆíÁý"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "°¡»óÆú´õ ÆíÁý"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "µé¾î¿À´Â°Å"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "³ª°¡´Â°Å"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "°¡»ó Æú´õ"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "ÁöÁ¤µÈ Æú´õ¸¸"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "ÇöÀç ½Ã°¢"
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "°¡»ó Æú´õ ¼Ò½º"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10820,42 +11049,42 @@ msgid "Beep"
 msgstr "Å©±â"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "ȸ»ç"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "Æ÷ÇÔ"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Æú´õ·Î º¹»ç"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "¹ÞÀº ³¯Â¥"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "º¸³½ ³¯Â¥"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "»èÁ¦µÊ"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
@@ -10877,88 +11106,84 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Ç¥Çö"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Áß¿ä"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Æú´õ·Î À̵¿"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "¼Ò¸® ¿¬ÁÖ"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "ÀÐÀ½"
 
@@ -10974,60 +11199,88 @@ msgstr ""
 msgid "Replied to"
 msgstr "ȸ½Å"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "¹Ù»Ý"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "º¸³½ÀÌ"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "»óÅ ¼³Á¤"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "ȸ»ç"
+
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Å©±â"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "°èÁ¤"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Á¦¸ñ"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "»óÅ ¼³Á¤"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 #, fuzzy
 msgid "Add Rule"
 msgstr "°Å¸£°Ô ±ÔÄ¢À» Ãß°¡"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Á¤½Ä À̸§ ÆíÁý"
@@ -11036,12 +11289,12 @@ msgstr "Á¤½Ä À̸§ ÆíÁý"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "ºä¸¦ %s·Î º¯°æ"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11049,18 +11302,18 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "°¡Á®¿À±â"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -11068,15 +11321,15 @@ msgstr ""
 "%sÀ» °¡Á®¿À±â.\n"
 "%s¸¦ ½ÃÀÛÇÕ´Ï´Ù"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" º¸³»´Â Áß"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "ÆíÁö"
 
@@ -11133,42 +11386,42 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP Æú´õ¸¦ »ìÆ캾´Ï´Ù"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 #, fuzzy
 msgid "Starting import"
 msgstr "½ÃÀÛ ³¯Â¥(_S):"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 #, fuzzy
 msgid "Settings"
 msgstr "¼³Á¤..."
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "°Å¸£°Ô ÆíÁý"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11245,12 +11498,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "´Þ·Â ¼³Á¤"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "°èÁ¤"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "´Þ·Â ¼³Á¤"
@@ -11304,67 +11557,87 @@ msgstr "¼³Á¤(_P)..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "¸ÞÀÏ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "¸Þ¼¼Áö"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "¸Þ¼¼Áö Àμâ"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ãë¼ÒÇÏ´Â Áß..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"¿¡´ëÇÑ ¼³Á¤"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "¼³Á¤"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Àӽà µð·ºÅ丮¸¦ ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù: %s"
@@ -11414,144 +11687,144 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °¡»ó Æú´õ »ý¼º(_V)"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Á¦¸ñ¿¡µû¸¥ °¡»óÆú´õ(_S)"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "¹ß¼ÛÀÚ¿¡µû¸¥ °¡»óÆú´õ(_n)"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "¼ö½ÅÀÚ¿¡µû¸¥ °¡»óÆú´õ(_R)"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Á¦¸ñ¿¡´ëÇÑ °Å¸£°Ô(_S)"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "¹ß¼ÛÀο¡´ëÇÑ °Å¸£°Ô(_n)"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "¼ö½ÅÀο¡´ëÇÑ °Å¸£°Ô(_R)"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Àμâ(_P)"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "º¸³½ »ç¶÷¿¡°Ô ȸ½Å"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Àüü ȸ½Å(_A)"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Àüü ȸ½Å(_A)"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "Àü´Þ(_F)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "¿Ï·áµÊ"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "ºñ¿ò(_l)"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_k)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã(_n)"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Áß¿ä"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "µÇ»ì¸²(_U)"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Æú´õ·Î À̵¿..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Æú´õ·Î º¹»ç(_C)..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "ÁÖ¼Ò·Ï Ãß°¡"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "°Å¸£°³ Àû¿ë"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °Å¸£°Ô »ý¼º(_C)"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
@@ -11617,81 +11890,71 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "Evolution ¼³Ä¡"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Host:"
 msgstr "È£½ºÆ®:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "»ç¿ëÀÚÀ̸§:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "°æ·Î:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Á¤¸»·Î ÀÌ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 #, fuzzy
 msgid "Don't delete"
 msgstr "µÇ»ì¸²"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 #, fuzzy
 msgid "Really delete account?"
 msgstr "±âº» °èÁ¤À¸·Î Çϱâ"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "°èÁ¤ °ü¸®"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11700,30 +11963,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "°Å¸£°Ô ÆíÁý"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Á¦¸ñ"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "º¸³½ »ç¶÷:"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "°Å¸£°Ô ±ÔÄ¢À» Ãß°¡"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11731,7 +11994,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11739,135 +12002,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "À̸ÞÀÏ º¸³»±â"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 #, fuzzy
 msgid "an unknown sender"
 msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 #, fuzzy
 msgid "No Message Selected"
 msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11875,36 +12134,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 #, fuzzy
 msgid "Filters"
 msgstr "ÆíÁö °Å¸£°³(_F)..."
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
@@ -11925,7 +12184,7 @@ msgstr "¼³¸í:"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "´Ù¸¥ ¿¬¶ôó"
@@ -11948,15 +12207,14 @@ msgstr "¼­¸í:"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11966,60 +12224,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution °èÁ¤ ¸¶¹ý»ç"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "ÁÖ"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "¹Þ´Â»ç¶÷"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "³¯Â¥"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "°èÁ¤"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12273,454 +12505,436 @@ msgstr "ÀúÀåÈÄ ¸¶Ä§"
 msgid "Loading Images"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "¸ÞÀÏ ¼³Á¤"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "¸ÞÀϹڽº Çü½Ä"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Ç¥½Ã"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "NNTP Server:"
-msgstr "LDAP ¼­¹ö"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "¸ÞÀÏ ¼³Á¤"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "»õ °¡»óÆú´õ(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Optional Information"
 msgstr "Á¤º¸ ¾øÀ½"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Á¶Á÷:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "¿¬¶ôó¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr ""
 "¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
 "  %s"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quoted"
 msgstr "Àοë(_Q)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "ȸ½Å ÁÖ¼Ò:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "ÆíÁö¸¦ ¹ÞÀ½"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "¹Þ¾ÒÀ½"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Required Information"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "»èÁ¦"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "º¸¾È(_S)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP ÇÁ·Î±×·¥ ÆÄÀÏÀ» ¼±ÅÃ"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ÆíÁö¸¦ º¸³¿"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "¸Þ¼¼Áö¸¦ Æú´õ·Î ÀúÀå"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "¸Þ¼¼ÁöµéÀ» ´Ù½Ã º¸³»±â(_R)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "¼­¹ö°¡ ÀÎÁõÀ» ¿ä±¸ÇÕ´Ï´Ù"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "¼­¹ö ¼³Á¤"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "¼­¹ö Á¾·ù: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "´ÜÃà ¸·´ë(_S)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "¼­¸í:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "¼­¸í:"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Source Information"
-msgstr "Á¤º¸ ¾øÀ½"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Çü½Ä À̸§:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:125
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:127
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr "ÀÌ ¼­¹ö¸¦ °¡¸£Å³ À̸§À» ÁöÁ¤Çϼ¼¿ä.°¡·É \"Á÷Àå\"À̳ª ¶Ç´Â \"Áý\"."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "ºÙÀ̱â"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "¼­¸í:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "ÀÎÁõ Á¾·ù:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "ÀÎÁõ Á¾·ù:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Æú´õ ºñ¿ì±â"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "¼­¸í:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "»èÁ¦"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "ÂÊ"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "´Ù¸¥ ÁÖ¼Ò·Î Àü´Þ"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "ÀüüÀ̸§:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "À̸ÞÀÏ º¸³»±â"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "±âº» °èÁ¤À¸·Î Çϱâ"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "À̸§:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP °æ·Î"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "ÆíÁö¸¦ ¹ÞÀ½"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Àüü ȸ½Å"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "º¸¾È(_S)"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "º¸¾È(_S)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "ÆíÁö¸¦ º¸³¿"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "º¸±â"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "¼­¸í:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Á¦°Å"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "»ö»ó"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "¼³¸í:"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12746,228 +12960,238 @@ msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
 msgid "Could not create a S/MIME decode context."
 msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "÷ºÎÆÄÀÏ ÀúÀå"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Àӽà mbox `%s'¸¦ ¸¸µé¼ö°¡ ¾ø½À´Ï´Ù: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "µð½ºÅ©·Î ÀúÀå..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "÷ºÎÆÄÀÏ ÀúÀå"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "%s¿¡¼­ ¿­±â..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "¼û±è"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "¸Þ½ÃÁö ³»¿ëÀ» Àоîµå¸²"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %Y/%m/%d %I:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "¼±ÅÃÇÑ°Í º¹»ç"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Æú´õ·Î ÀúÀå(_f)... (°íÄ¥¿¹Á¤)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 #, fuzzy
 msgid "Save Image as..."
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷ºÎ"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "³¯Â¥"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "º¸³½ÀÌ"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ½Å ÁÖ¼Ò:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "¹Þ´Â»ç¶÷"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 #, fuzzy
 msgid "Cc"
 msgstr "ÂüÁ¶:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "¼ûÀº ÂüÁ¶:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "ÆíÁö"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr ""
 "%s µð·ºÅ丮¸¦ »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
 "%s"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "°¡»ó Æú´õ"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Æú´õ Àç¼³Á¤"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" Æú´õ¸¦ \"%s\" Æ÷¸äÀ¸·Î ¹Ù²Ù±â"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s ¼³Á¤"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12976,7 +13200,7 @@ msgstr ""
 "ÀÛ¾÷ ¼öÇàÁß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12985,102 +13209,102 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "Æú´õ Àç¼³Á¤"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "ÆíÁö¸¦ ¹ÞÀ½"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" º¸³»´Â Áß"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "¿Ï·áµÊ"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "¸Þ¼¼Áö¸¦ Æú´õ·Î ÀúÀå"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "¸Þ½ÃÁöµéÀ» %s·Î À̵¿"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "¸Þ½ÃÁöµéÀ» %s·Î º¹»ç"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s Æú´õ¸¦ ¿­±â"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s Æú´õ¸¦ ¿­±â"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s Æú´õ¸¦ ¿­±â"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Æú´õ Àç¼³Á¤"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Æú´õ ºñ¿ì±â"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "¸Þ¼¼Áö %s¸¦ °¡Á®¿À±â"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "¸Þ¼¼ÁöµéÀ» °¡Á®¿À±â"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13089,7 +13313,7 @@ msgstr ""
 "Ãâ·ÂÆÄÀÏÀ» »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13098,11 +13322,11 @@ msgstr ""
 "%s·Î ¸Þ½ÃÁö ÀúÀåÁß ¿À·ù ¹ß»ý:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "÷ºÎ ÀúÀå"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13111,27 +13335,22 @@ msgstr ""
 "Ãâ·Â ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "¹Þ¾ÒÀ½"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "°Ë»ö(_S)"
 
@@ -13194,37 +13413,46 @@ msgstr ""
 msgid "Type: %s"
 msgstr "ÇüÅÂ:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "ÆíÁö ÁÖ°í¹Þ±â"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Ãë¼ÒµÊ"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 #, fuzzy
 msgid "Updating..."
 msgstr "°»½ÅÁß ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 #, fuzzy
 msgid "Waiting..."
 msgstr "±â´Ù¸®´Â Áß ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 #, fuzzy
 msgid "User canceled operation."
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "ºñ¹Ð¹øÈ£"
@@ -13255,7 +13483,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr "ÀÌ ¼­¹ö¸¦ °¡¸£Å³ À̸§À» ÁöÁ¤Çϼ¼¿ä.°¡·É \"Á÷Àå\"À̳ª ¶Ç´Â \"Áý\"."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "À̸§:"
 
@@ -13286,7 +13514,7 @@ msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
 msgid "Forwarded message"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
@@ -13301,7 +13529,7 @@ msgstr "%s Æú´õ¸¦ ¿­±â"
 msgid "Updating vfolders for uri: %s"
 msgstr "%s Æú´õ¸¦ ¿­±â"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13310,97 +13538,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "°¡»ó Æú´õ"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Æú´õ"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "°¡»óÆú´õ ÆíÁý"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "»õ °¡»óÆú´õ"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "Àü´Þ: (Á¦¸ñ ¾øÀ½)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "¸Þ¼¼Áö"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "¿©·¯°³ÀÇ º¸Áö¾ÊÀº ¸Þ¼¼Áö"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "¿À´Ã %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "¾îÁ¦ %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 #, fuzzy
 msgid "Generating message list"
 msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
@@ -13435,47 +13666,47 @@ msgstr "¹Þ¾ÒÀ½"
 msgid "Size"
 msgstr "Å©±â"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Ãë¼ÒµÊ"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "½Ã°£»óÀ¸·Î ¾ÕÀ¸·Î °¡±â"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Á¤º¸ ¾øÀ½"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Àü´Þ"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "ȸ½Å"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Àüü ȸ½Å"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "¹Ì¸®º¸±â"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13499,17 +13730,17 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Æú´õ"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 #, fuzzy
 msgid "No server has been selected"
 msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18295,11 +18526,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24158,8 +24389,8 @@ msgstr "¼³¸í:"
 msgid "Mail summary"
 msgstr "¿ä¾à"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "°¡»ó Æú´õ"
@@ -24178,15 +24409,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24200,27 +24431,27 @@ msgstr "<b>´Þ·Â¸¦ ÀдÂÁß ¿À·ù</b>"
 msgid "News Feed"
 msgstr "»õ °¡»óÆú´õ(_N)"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "¸ðµÎ"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Ãß°¡"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "º¸±â"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 #, fuzzy
 msgid "No tasks"
 msgstr "¾÷¹«"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "¼³¸í:"
@@ -25536,7 +25767,7 @@ msgstr "ÀÛ¾÷"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "Weather settings"
+msgid "Weather Settings"
 msgstr "¼±ÅÃÇÑ ºÎºÐ ºñ¿ò"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25600,7 +25831,7 @@ msgstr "ÀÚ¼¼È÷"
 msgid "Cancel Operation"
 msgstr "¹ÌÆà Ãë¼Ò"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25612,21 +25843,21 @@ msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
 msgid "Add a Folder"
 msgstr "Æú´õ ¼±ÅÃ"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "ÃÊ°í"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "º¸³¿"
@@ -25842,20 +26073,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - »õ Æú´õ »ý¼º"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "»õ Æú´õ¸¦ »ý¼º"
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "»õ·Î¿î..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Á¦¸ñ¾øÀ½)"
 
@@ -25872,7 +26098,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -25900,22 +26126,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Æú´õ ¼±ÅÃ"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution ¼³Ä¡"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25924,11 +26146,11 @@ msgstr ""
 "´ÙÀ½À» °¡Á®¿Ã ¼öÀÖ´Â µµ±¸°¡ ¾ø½À´Ï´Ù\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "°¡Á®¿À±â"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25937,17 +26159,17 @@ msgstr ""
 "%sÀ» °¡Á®¿À±â.\n"
 "%s¸¦ ½ÃÀÛÇÕ´Ï´Ù"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25956,56 +26178,56 @@ msgstr ""
 "%s¸¦ °¡Á®¿À´Â Áß\n"
 "¾ÆÀÌÅÛ 1À» °¡Á®¿È."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "ÀÚµ¿"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "ÆÄÀÏ À̸§:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "ÆÄÀÏ Á¾·ù:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "°¡Á®¿À±â"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "º¸³½ »ç¶÷:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 #, fuzzy
 msgid "Select folder"
 msgstr "Æú´õ ¼±ÅÃ"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "°¡Á®¿À±â"
 
@@ -26051,9 +26273,14 @@ msgstr "%s Æú´õ¸¦ ¿­±â"
 msgid "in \"%s\" ..."
 msgstr "%s¿¡¼­ ¿­±â..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "`%s'¿¡ÀÖ´Â Æú´õ¸¦ ¿­¼ö°¡ ¾ø½À´Ï´Ù"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "¸í½ÃµÈ Æú´õ¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù:\n"
 "%s"
@@ -26070,8 +26297,8 @@ msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 #, fuzzy
 msgid "New"
@@ -26118,58 +26345,58 @@ msgstr "Æú´õ À̵¿..."
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Work Offline"
 msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ç¥½ÃµÈ Æú´õ°¡ ¾øÀ½)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "(À̸§ ¾øÀ½)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26177,12 +26404,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "½Ã½ºÅÛ ÀúÀåÀåÄ¡¸¦ ÁöÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26190,32 +26417,32 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "¸ÞÀÏ ¼³Á¤ Druid"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "ÀÏ¹Ý ¿À·ù"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "±×·ì À̸§:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26224,117 +26451,127 @@ msgstr ""
 "´ÜÃà ¸·´ë·ÎºÎÅÍ `%s'±×·ìÀ»\n"
 "Á¤¸»·Î Áö¿ì½Ã°Ú½À´Ï±î?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Áö¿ìÁö¸¶¼¼¿ä"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "ÀÛÀº ¾ÆÀÌÄÜ(_S)"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "ÀÛÀº ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Å« ¾ÆÀÌÄÜ(_L)"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Å« ¾ÆÀÌÄÜÀ¸·Î ´ÜÃื´ë º¸±â"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "»õ ±×·ì(_N)..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "»õ ±×·ì(_N)..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "´ÜÃà ¸·´ë °¨Ãß±â(_H)"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "´ÜÃà ¸·´ë¸¦ °¨Ãã´Ï´Ù"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
+
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "±ÔÄ¢ À̸§: "
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "ÀÌ ´ÜÃà±×·ìÀ» Á¦°Å"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "Á¦°Å"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 #, fuzzy
 msgid "Shortcuts"
 msgstr "´ÜÃà ¸·´ë(_S)"
@@ -26343,56 +26580,56 @@ msgstr "´ÜÃà ¸·´ë(_S)"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "¿¡·¯ ¾øÀ½"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "°°Àº À̸§ÀÇ Æú´õ°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "ÁöÁ¤µÈ ÆúÅÍ Çü½ÄÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "ÀÔÃâ·Â ¿À·ù"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Æú´õ¸¦ ¸¸µé±â¿¡ ÃæºÐÇÑ °ø°£ÀÌ ¾øÀ½"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "ÀÌ ÀúÀå¸Åü¿¡ ÁöÁ¤µÈ Çü½ÄÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
@@ -26437,73 +26674,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "ÀÔÃâ·Â ¿À·ù"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "÷ºÎ"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "(À̸§ ¾øÀ½)"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "ÀÔÃâ·Â ¿À·ù"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "Á¾·á(_x)"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "´Þ·Â"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "%s°°Àº Æú´õ°¡ ¾øÀ½"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26530,6 +26767,26 @@ msgstr "È£½ºÆ®:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "´Þ·Â"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "¿¬¶ôó(_C)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "ÆíÁö"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "ÀÛ¾÷"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Æú´õ À̸§:"
@@ -26542,6 +26799,34 @@ msgstr "Æú´õ Á¾·ù:"
 msgid "Specify where to create the folder:"
 msgstr "Æú´õ ¸¸µé °÷À» ÁöÁ¤Çϼ¼¿ä:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "»õ Æú´õ¸¦ »ý¼º"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Æú´õ À̸§:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "¼­¹ö Á¾·ù::"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "»ç¿ëÀÚÀ̸§:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26639,16 +26924,16 @@ msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26668,7 +26953,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26677,47 +26962,47 @@ msgstr ""
 "°¨»çÇÕ´Ï´Ù\n"
 "Evolution ÆÀ\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution ½©À» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution ½©À» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "½ÃÀÛ ³¯Â¥(_S):"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "½ÃÀÛ ³¯Â¥(_S):"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "º¸³ëº¸ ÄÄÆ÷³ÍÆ® ½Ã½ºÅÛÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
 
@@ -26757,128 +27042,120 @@ msgstr "¼±ÅÃÇÑ°Í º¹»ç"
 msgid "Copy to Folder..."
 msgstr "Æú´õ·Î º¹»ç..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
-
-#: ui/evolution-addressbook.xml.h:7
-#, fuzzy
-msgid "Create new contact list"
-msgstr "»õ·Î¿î ¿¬¶ôó¸¦ ¸¸µç´Ù"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "¼±ÅÃÇÑ°Í ÀÚ¸§"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Æú´õ·Î À̵¿..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Æú´õ·Î À̵¿..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Ŭ¸³º¸µå¿¡¼­ ºÙ¿©³Ö±â"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Àμ⠹̸®º¸±â(_v)"
+
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "¿¬¶ôó¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "ÀüºÎ ¼±ÅÃ"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "¿¬¶ôó¸¦ Áö¿î´Ù"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î À̵¿ÇÕ´Ï´Ù"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "ÁßÁö"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Ãë¼Ò"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "ÇöÀç ½Ã°¢"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "Çൿ(_A)"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "¿¬¶ôó(_C)"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "¿¬¶ôó(_C)..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Æú´õ·Î À̵¿(_M)..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "VCard·Î ÀúÀå"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "¿¬¶ôó ã±â(_S)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "ÀüºÎ ¼±ÅÃ(_S)"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
@@ -26930,11 +27207,6 @@ msgstr "´Þ(_M)"
 msgid "Previews the calendar to be printed"
 msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Àμ⠹̸®º¸±â(_v)"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -26972,7 +27244,7 @@ msgstr "ÁÖ(_W)"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "´Ý±â"
 
@@ -26986,7 +27258,7 @@ msgid "Delete this item"
 msgstr "ÀÌ Ç׸ñ¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -26999,8 +27271,8 @@ msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
 msgid "Print this item"
 msgstr "ÀÌ Ç׸ñÀ» Àμâ"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "ÀúÀå"
 
@@ -27027,9 +27299,9 @@ msgstr "ºä¸¦ %s·Î º¯°æ"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "ÆÄÀÏ(_F)"
 
@@ -27039,7 +27311,7 @@ msgstr "ºÀÅõ Àμâ(_v)..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_A)..."
 
@@ -27054,8 +27326,8 @@ msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "ÀúÀå(_S)"
 
@@ -27163,27 +27435,37 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "»õ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "¸Þ¼¼Áö¸¦ Æú´õ·Î ÀúÀå"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "°¡»ó Æú´õ ÆíÁý±â(_E)..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "ÆíÁö °Å¸£°³(_F)..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "¹Ì¸®º¸±â"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Æú´õ·Î À̵¿(_M)..."
@@ -27289,7 +27571,7 @@ msgstr "¿¬°üµÈ ¸Þ¼¼Áö ¸ñ·Ï"
 msgid "_Expunge"
 msgstr "Á¦°Å(_E)"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "Æú´õ(_F)"
 
@@ -27573,200 +27855,215 @@ msgstr "¸Þ¼¼Áö Àμâ"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "ȸ½Å"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "ÀÌÀü"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "¸Þ¼¼Áö¸¦ ÁöÁ¤ÇÑ Æú´õ·Î ÀúÀåÇÕ´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "¸ðµç Çì´õ º¸±â(_H)"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "¹ß¼ÛÀÚ¿¡µû¸¥ °¡»óÆú´õ(_n)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "¼ö½ÅÀÚ¿¡µû¸¥ °¡»óÆú´õ(_R)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Á¦¸ñ¿¡µû¸¥ °¡»óÆú´õ(_S)"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "÷ºÎ"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Æú´õ·Î º¹»ç"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °Å¸£°Ô »ý¼º(_C)"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "°¡±â"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "¹Ý´ë"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "ȧȧ"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "Ç¥½Ã"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Æú´õ·Î À̵¿"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "¸Þ¼¼Áö"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Ç¥½Ã"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Open Message"
 msgstr "¸Þ¼¼ÁöµéÀ» ´Ù½Ã º¸³»±â(_R)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "¸Þ¼¼Áö Àμâ"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Àοë(_Q)"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "¿­±â(_O)..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "µµ±¸(_T)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "µÇ»ì¸²(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "ÀÌ Ã¢À» ´Ý½À´Ï´Ù"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "´Ý±â(_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "º¸±â(_V)"
 
@@ -27796,174 +28093,164 @@ msgstr ""
 msgid "For_mat"
 msgstr "Çü½Ä"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-msgid "Inline Text _File..."
-msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "¸Þ¼¼Áö¿¡ ÅؽºÆ®·Î ÆÄÀÏÀ» »ðÀÔÇÕ´Ï´Ù"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "¿­±â"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "ÆÄÀÏÀ» ¿±´Ï´Ù"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP ¾Ïȣȭ"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP ¼­¸í"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "S/MIME Encrypt"
 msgstr "PGP ¾Ïȣȭ"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "ÃÊ°í¸¦ ÀúÀå(_D)"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Æú´õ·Î ÀúÀå..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "ÇöÀç ÆÄÀÏÀ» ÀúÀå"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "ÇöÀç ÆÄÀÏÀ» ´Ù¸¥À̸§À¸·Î ÀúÀåÇÕ´Ï´Ù"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "¸Þ¼¼Áö¸¦ ÁöÁ¤ÇÑ Æú´õ·Î ÀúÀåÇÕ´Ï´Ù"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "º¸³¿"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "³ªÁß¿¡ º¸³¿(_L)"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "³ªÁß¿¡ º¸³¿(_L)"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "ÆíÁö¸¦ HTMLÇü½ÄÀ¸·Î º¸³¿"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ Áö±Ý º¸³À´Ï´Ù"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "÷ºÎ¹° º¸ÀÓ/¼û±è"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "÷ºÎ¹° º¸±â(_a)"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "÷ºÎ¹° º¸±â"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "ÀÌ ¸Þ¼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ÀÌ ¸Þ¼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "¼ûÀº ÂüÁ¶C Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "ÂüÁ¶ Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "¹ß½Å Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ȸ½Å ÁÖ¼Ò Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "_Attachment..."
 msgstr "÷ºÎ(_A)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "¼ûÀº ÂüÁ¶ Ç׸ñ(_B)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "ÂüÁ¶ Ç׸ñ(_C)"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "_Delete all"
 msgstr "»èÁ¦(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "¹ß½Å Ç׸ñ(_F)"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "»ðÀÔ(_I)"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "¿­±â(_O)..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "ȸ½Å ÁÖ¼Ò Ç׸ñ(_R)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "ÀÛ¾÷À» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "µµ¿ò¸»(_H)"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "¼­¸í:"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -28071,186 +28358,216 @@ msgstr "´ÜÃà ¸·´ë(_S)"
 
 #: ui/evolution.xml.h:3
 #, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution ¼³Ä¡"
+
+#: ui/evolution.xml.h:4
+#, fuzzy
 msgid "Change the name of this folder"
 msgstr "ºä¸¦ %s·Î º¯°æ"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "Copy this folder"
 msgstr "Æú´õ·Î º¹»ç"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Create _New Folder..."
 msgstr "»õ Æú´õ¸¦ »ý¼º"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Create a new folder"
 msgstr "»õ Æú´õ¸¦ »ý¼º"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "»õ Æú´õ¸¦ »ý¼º"
+
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Delete this folder"
 msgstr "ÀÌ Ç׸ñ¸¦ »èÁ¦ÇÕ´Ï´Ù"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "´Ù¸¥ Æú´õ¸¦ Ç¥½Ã"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Á¾·á(_x)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution ¼³Ä¡"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "ÇÁ·Î±×·¥À» ¸¶Ä¨´Ï´Ù"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "%sÀ»(¸¦) ¿ÞÂÊÀ¸·Î À̵¿"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "»õ Æú´õ¸¦ »ý¼º"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "º¸³»°í ¹Þ±â"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "¹Ð¸° ÆíÁö¸¦ º¸³»°í »õ ÆíÁö¸¦ °¡Á®¿Â´Ù"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "¸ÞÀÏ ¼³Á¤"
+
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "EvolutionÀÇ Á¤º¸ º¸±â"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "¹ö±× Á¦º¸"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "¹ö±× Á¦º¸(_B)"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy·Î ¹ö±×Á¦º¸¸¦ ÇÕ´Ï´Ù"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "¹ß½Å Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "¼±ÅÃµÈ Æú´õ º¸±â"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution˼..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution˼(_A)..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Copy..."
 msgstr "º¹»ç(_C)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "Æú´õ(_F)"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Æú´õ·Î °¡±â(_G)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "°¡Á®¿À±â"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Move..."
 msgstr "À̵¿"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "»õ·Î¿î(_N)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "»õ °¡»óÆú´õ(_N)"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+msgid "_Preferences..."
+msgstr "´Þ·Â ¼³Á¤"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Rename..."
 msgstr "¿­±â(_O)..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "º¸³»°í ¹Þ±â(_S)"
 
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Shortcut"
+#: ui/evolution.xml.h:59
+msgid "_Shortcut Bar"
 msgstr "´ÜÃà ¸·´ë(_S)"
 
-#: ui/evolution.xml.h:55
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
 msgstr "´ÜÃà ¸·´ë(_S)"
 
 #: ui/my-evolution.xml.h:3
@@ -28269,19 +28586,39 @@ msgstr ""
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
-msgid "Address Cards"
-msgstr "ÁÖ¼Ò _2:"
+msgid "By _Company"
+msgstr "ȸ»ç"
 
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "ȸ»ç"
+msgid "_Address Cards"
+msgstr "ÁÖ¼Ò _2:"
 
 #: views/addressbook/galview.xml.h:3
 #, fuzzy
-msgid "Phone List"
+msgid "_Phone List"
 msgstr "ÀüÈ­ ÇüÅÂ"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "ÁÖ"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Ä«µå: "
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "´Þ"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "ÁÖ"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28311,14 +28648,19 @@ msgstr "Á¦¸ñ"
 msgid "Messages"
 msgstr "¸Þ¼¼Áö"
 
-#: views/tasks/galview.xml.h:2
+#: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With Category"
+msgid "With _Category"
 msgstr "¸ñ·Ï:"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "ÀÛ¾÷"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28476,12 +28818,12 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 #, fuzzy
 msgid "Search Editor"
 msgstr "¿¬¶ôó ÆíÁý±â"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr ""
 
@@ -28521,22 +28863,22 @@ msgstr "¸Þ¼¼Áö"
 msgid "Don't show this message again."
 msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "ã±â"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "ºñ¿ò(_l)"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "ºñ¿ò(_l)"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Find Now"
 msgstr "ã±â"
@@ -28551,19 +28893,95 @@ msgstr "°³Àοë ÁÖ¼Ò·Ï ¼­¹ö"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): ±×³ðÀ» ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "À̵¿"
+
+#, fuzzy
+#~ msgid "_Delete this Appointment"
+#~ msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "ÀÔÃâ·Â ¿À·ù"
+
+#, fuzzy
+#~ msgid "Insert File"
+#~ msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
+
+#, fuzzy
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "ÂÁ. °í¸¥ ³¯Â¥°¡ ÀûÇÕÇÏÁö¾Ê³×¿ä."
+
+#, fuzzy
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution ¼³Ä¡"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
+
+#, fuzzy
+#~ msgid "NNTP Server:"
+#~ msgstr "LDAP ¼­¹ö"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "»õ °¡»óÆú´õ(_N)"
+
+#, fuzzy
+#~ msgid "Source Information"
+#~ msgstr "Á¤º¸ ¾øÀ½"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "µð½ºÅ©·Î ÀúÀå..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - »õ Æú´õ »ý¼º"
+
+#, fuzzy
+#~ msgid "_Contact List"
+#~ msgstr "¿¬¶ôó(_C)"
+
+#, fuzzy
+#~ msgid "Inline Text _File..."
+#~ msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "¸Þ¼¼Áö¿¡ ÅؽºÆ®·Î ÆÄÀÏÀ» »ðÀÔÇÕ´Ï´Ù"
+
+#~ msgid "Insert text file..."
+#~ msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ"
+
+#~ msgid "Send _Later"
+#~ msgstr "³ªÁß¿¡ º¸³¿(_L)"
+
+#~ msgid "Send _later"
+#~ msgstr "³ªÁß¿¡ º¸³¿(_L)"
+
+#~ msgid "Send the message later"
+#~ msgstr "³ªÁß¿¡ ¸Þ¼¼Áö¸¦ º¸³À´Ï´Ù"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "ÁÖ¼Ò·Ï ¼Ò½º"
 
@@ -28635,10 +29053,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgstr "¹ÌÆà Ãë¼Ò"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "¼­¸í ÆÄÀÏ:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "¼­¸í ÆÄÀÏÀ» °í¸£¼¼¿ä"
 
@@ -28862,9 +29276,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgid "_Mobile"
 #~ msgstr "ÈÞ´ëÀüÈ­(_M)"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
-
 #, fuzzy
 #~ msgid "Create new appointments with a default _reminder"
 #~ msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
@@ -28891,9 +29302,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "¸Þ¼¼Áö¿¡¼­ º¸³½ »ç¶÷À» ¾Ë¾Æ³¾¼ö°¡ ¾øÀ½"
 
@@ -28907,10 +29315,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgstr "¸Þ¼¼Áö¸¦ º¸³Â½À´Ï´Ù"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
 
@@ -28945,10 +29349,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgstr "Á¶Á÷:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "±âº»À¸·Î ÆíÁö¸¦ HTMLÇü½ÄÀ¸·Î º¸³¿"
 
@@ -28991,10 +29391,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
 #~ msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
 
 #, fuzzy
-#~ msgid "Create a New _Task"
-#~ msgstr "»õ ´Þ·ÂÀ» ¸¸µì´Ï´Ù"
-
-#, fuzzy
 #~ msgid "Create a _New Appointment"
 #~ msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"