[evolution] Updated Korean translation



commit d5da252a1667ed856503d16d025706c86115054a
Author: Changwoo Ryu <cwryu debian org>
Date:   Sat Sep 14 18:55:19 2013 +0900

    Updated Korean translation

 po/ko.po | 5946 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2991 insertions(+), 2955 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index d78a6bd..12c8f6b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -40,14 +40,14 @@
 #   - day view -> 일별 보기
 #   - work week view -> 근무일 주별 보기
 #   - date navigator -> 날짜 선택 달력
-#: ../shell/main.c:573
+#: ../shell/main.c:557
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2013-02-26 20:24+0000\n"
-"PO-Revision-Date: 2013-03-17 22:53+0900\n"
+"POT-Creation-Date: 2013-09-07 23:08+0000\n"
+"PO-Revision-Date: 2013-09-14 18:55+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
 "Language: Korean\n"
@@ -216,8 +216,8 @@ msgstr ""
 "이 주소가 들어 있는 연락처가 이미 있습니다. 그래도 같은 주소의 카드를 새로 만"
 "드시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../e-util/e-table-config.ui.h:6
-#: ../e-util/e-name-selector-dialog.c:965 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "추가(_A)"
 
@@ -254,7 +254,7 @@ msgstr ""
 "하시겠습니까?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
 msgid "Failed to delete contact"
 msgstr "연락처를 삭제하는데 실패했습니다"
 
@@ -276,9 +276,9 @@ msgstr ""
 "처 보기에서 다른 주소록을 선택하십시오."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:635
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:657
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
@@ -302,7 +302,7 @@ msgstr "위치(_W):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "분류(_T)..."
 
@@ -315,10 +315,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "HTML 메일 받음(_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/merging/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
 #: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "전자메일"
@@ -332,7 +332,7 @@ msgid "Instant Messaging"
 msgstr "인스턴스 메시징"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1001
+#: ../addressbook/importers/evolution-vcard-importer.c:1003
 msgid "Contact"
 msgstr "연락처"
 
@@ -343,7 +343,7 @@ msgstr "홈페이지(_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1850
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "달력(_C):"
 
@@ -437,8 +437,8 @@ msgid "_Anniversary:"
 msgstr "기념일(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../calendar/gui/e-calendar-view.c:2193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2278
 msgid "Anniversary"
 msgstr "기념일"
 
@@ -448,13 +448,12 @@ msgstr "기념일"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
 msgid "Birthday"
 msgstr "생일"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "기타"
 
@@ -488,26 +487,26 @@ msgstr "주소(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:308
-#: ../addressbook/gui/widgets/eab-contact-display.c:389
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/e-contact-map.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "집"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:316
-#: ../addressbook/gui/widgets/eab-contact-display.c:386
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../addressbook/gui/widgets/e-contact-map.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "업무"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
-#: ../calendar/gui/e-cal-model.c:3466
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
 msgid "Other"
 msgstr "기타"
 
@@ -520,78 +519,78 @@ msgid "Notes"
 msgstr "쪽지"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "재버"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "야후"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "가두가두"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "그룹와이즈"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "스카이프"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "트위터"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:227
-#: ../addressbook/gui/widgets/eab-gui-util.c:493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "연락처를 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error modifying contact"
 msgstr "연락처를 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Error removing contact"
 msgstr "연락처를 제거하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:651
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연락처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3474
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
 msgid "Please select an image for this contact"
 msgstr "이 연락처에 사용할 그림을 선택하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3475
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
 msgid "_No image"
 msgstr "그림 없음(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,48 +598,48 @@ msgstr ""
 "연락처 데이터가 잘못되었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' 형식은 미래가 되면 안 됩니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3830
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3843
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3857
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'이(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3872
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
 msgid "Invalid contact."
 msgstr "연락처가 잘못되었습니다."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "Contact Quick-Add"
 msgstr "연락처 빠른 추가"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:487
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
 msgid "_Full name"
 msgstr "전체 이름(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:500
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
 msgid "E_mail"
 msgstr "전자 메일(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
 msgid "_Select Address Book"
 msgstr "주소록 선택(_S)"
 
@@ -716,7 +715,7 @@ msgid "_Suffix:"
 msgstr "호칭(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:814
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
@@ -753,23 +752,23 @@ msgstr "주소록에서 전자메일 주소 넣기"
 msgid "_Select..."
 msgstr "선택(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:937
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "연락처 목록 구성원"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1463
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "구성원(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1582
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
 msgid "Error adding list"
 msgstr "목록을 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
 msgid "Error modifying list"
 msgstr "목록을 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1612
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
 msgid "Error removing list"
 msgstr "목록을 제거하는 중 오류가 발생했습니다"
 
@@ -796,7 +795,7 @@ msgid "Changed Contact:"
 msgstr "바뀐 연락처:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/merging/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "합치기(_M)"
 
@@ -816,29 +815,34 @@ msgstr "원래 연락처:"
 msgid "New Contact:"
 msgstr "새 연락처:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "취소함"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "연락처 합치기"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1154
 msgid "Name contains"
 msgstr "이름에 포함"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Email begins with"
 msgstr "메일 주소 시작"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1090
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "필드에 포함"
 
@@ -852,68 +856,68 @@ msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "연락처 %d개"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:367
+#: ../addressbook/gui/widgets/e-addressbook-model.c:373
 msgid "Error getting book view"
 msgstr "주소록 보기를 가져오는데 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:814
+#: ../addressbook/gui/widgets/e-addressbook-model.c:820
 msgid "Search Interrupted"
 msgstr "검색 중단"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
 msgid "Error modifying card"
 msgstr "카드를 수정하는데 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "선택한 연락처를 클립보드로 잘라냅니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "선택한 연락처를 클립보드로 복사합니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "클립보드에서 연락처를 붙여 넣습니다"
 
 # tooltip
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "Delete selected contacts"
 msgstr "선택한 연락처를 삭제합니다"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "보이는 모든 연락처 선택"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "정말로 이 연락처 목록을 삭제하시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact list?"
 msgstr "정말로 이 연락처 목록을 삭제하시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "정말로 연락처 목록을 (%s) 삭제하시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete these contacts?"
 msgstr "정말로 이 연락처를 삭제하시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 msgid "Are you sure you want to delete this contact?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "정말로 연락처를 (%s) 삭제하시겠습니까?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -925,11 +929,11 @@ msgstr[0] ""
 "연락처 %d개를 열면 창 %d개를 새로 열게 됩니다.\n"
 "정말로 이 연락처를 모두 여시겠습니까?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1471
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "_Don't Display"
 msgstr "표시하지 않기(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "Display _All Contacts"
 msgstr "모든 연락처 표시(_A)"
 
@@ -946,7 +950,7 @@ msgid "Family Name"
 msgstr "성"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
 msgid "Nickname"
 msgstr "별명"
 
@@ -1003,7 +1007,7 @@ msgid "ISDN Phone"
 msgstr "ISDN 전화"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
@@ -1042,7 +1046,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
 msgid "Company"
 msgstr "회사"
 
@@ -1060,18 +1064,18 @@ msgid "Title"
 msgstr "직위"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:663
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "역할"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
 msgid "Manager"
 msgstr "관리자"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
 msgid "Assistant"
 msgstr "비서"
 
@@ -1093,16 +1097,16 @@ msgid "Categories"
 msgstr "분류"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Spouse"
 msgstr "배우자"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 msgid "Note"
 msgstr "메모"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+#: ../addressbook/gui/widgets/e-contact-map-window.c:363
 msgid "Contacts Map"
 msgstr "연락처 지도"
 
@@ -1213,118 +1217,118 @@ msgstr "연락처: "
 msgid "evolution minicard"
 msgstr "에볼루션 미니카드"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "전자메일 주소 복사(_E)"
 
 # tooltip
-#: ../addressbook/gui/widgets/eab-contact-display.c:154
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
 msgstr "전자메일 주소를 클립보드로 복사합니다"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "새 메시지 보내기(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
 msgstr "전자메일 메시지를 이 주소로 보냅니다"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:323
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s 주소로 보내려면 누르십시오"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
 msgstr "지도 열기"
 
 # List는 여기서 Mailing List를 말한다
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
 msgstr "리스트 구성원:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "부서"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "업무"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "직위"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "화상 대화"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../modules/calendar/e-cal-shell-view.c:591
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "달력"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../calendar/gui/dialogs/event-editor.c:122
-#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "약속 있음/없음"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "전화"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "팩스"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "주소"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "웹로그"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "개인"
 
 # List는 여기서 Mailing List를 말한다
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "리스트 구성원"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "직위"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "블로그"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1335,7 +1339,7 @@ msgstr ""
 "입니다. 연결 상태 모드에서 주소록을 다시 읽어들여서 그 내용을 다운로드하십시"
 "오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1344,7 +1348,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
 "는지 확인하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:150
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1352,7 +1356,7 @@ msgstr ""
 "이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP을 사용하려"
 "면 LDAP을 지원하는 에볼루션을 설치해야 합니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1360,11 +1364,11 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid "Detailed error message:"
 msgstr "자세한 오류 메시지:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:204
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1376,7 +1380,7 @@ msgstr ""
 "좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서 \n"
 "결과의 한계치를 지정하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1388,105 +1392,101 @@ msgstr ""
 "시간 제한을 늘려 보십시오."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:219
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "이 주소록의 백엔드에서 이 질의를 파싱할 수 없습니다. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "이 주소록의 백엔드에서 이 질의를 수행하길 거부했습니다. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:230
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "이 질의가 성공적으로 끝나지 않았습니다. %s"
 
 # 파일 이름
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:258
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
 msgid "card.vcf"
 msgstr "카드.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:309
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 msgid "Select Address Book"
 msgstr "주소록 선택"
 
 # 파일 이름
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
 msgid "list"
 msgstr "목록"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:581
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Move contact to"
 msgstr "연락처 이동"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:583
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Copy contact to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Move contacts to"
 msgstr "연락처 이동"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "카드: "
-
-#: ../addressbook/importers/evolution-csv-importer.c:744
-#: ../addressbook/importers/evolution-ldif-importer.c:543
-#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:281
 #: ../calendar/importers/icalendar-importer.c:440
 #: ../calendar/importers/icalendar-importer.c:935
 #: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "가져오는 중..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1079
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "아웃룩 연락처 CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1080
+#: ../addressbook/importers/evolution-csv-importer.c:1083
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "아웃룩 연락처 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1088
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "모질라 연락처 CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:1092
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "모질라 연락처 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1097
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "에볼루션 연락처 CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1101
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "에볼루션 연락처 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:801
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 데이터 교환 형식 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:802
+#: ../addressbook/importers/evolution-ldif-importer.c:808
 msgid "Evolution LDIF importer"
 msgstr "에볼루션 LDIF 가져오기"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:664
+#: ../addressbook/importers/evolution-vcard-importer.c:666
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:665
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "Evolution vCard Importer"
 msgstr "에볼루션 vCard 가져오기"
 
@@ -1557,7 +1557,7 @@ msgstr[0] "시간"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "일"
@@ -1578,16 +1578,16 @@ msgstr "모두 해제(_A)"
 msgid "_Snooze"
 msgstr "연기 모드(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
 msgid "_Dismiss"
 msgstr "해제(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../calendar/alarm-notify/alarm-queue.c:1823
+#: ../calendar/alarm-notify/alarm-queue.c:1833
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "위치:"
 
@@ -1603,7 +1603,7 @@ msgstr "연기할 시간(_T):"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
 #: ../e-util/e-interval-chooser.c:143
 #: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1611,67 +1611,53 @@ msgid "days"
 msgstr "일"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
 #: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "시간"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
 #: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
 msgid "minutes"
 msgstr "분"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1665
+#: ../calendar/alarm-notify/alarm-queue.c:1803
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1621
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1674
+#: ../calendar/alarm-notify/alarm-queue.c:1676
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1631
+#: ../calendar/alarm-notify/alarm-queue.c:1684
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1636
-#: ../calendar/alarm-notify/alarm-queue.c:1737
-#: ../calendar/alarm-notify/alarm-queue.c:2099
+#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1794
+#: ../calendar/alarm-notify/alarm-queue.c:2135
 msgid "Evolution Reminders"
 msgstr "에볼루션 알림"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "미리 알림이 %d개 있습니다"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1884
-#: ../calendar/alarm-notify/alarm-queue.c:1919
+#: ../calendar/alarm-notify/alarm-queue.c:1955
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"에볼루션은 아직 전자메일을 통한 달력 미리 알림 기능을\n"
-"지원하지 않습니다. 하지만 이 미리 알림이 전자메일을\n"
-"보내도록 설정되어 있습니다. 에볼루션에서는 전자메일을\n"
-"보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
-
-# Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1925
+#: ../calendar/alarm-notify/alarm-queue.c:1961
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1688,7 +1674,7 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1940
+#: ../calendar/alarm-notify/alarm-queue.c:1976
 msgid "Do not ask me about this program again."
 msgstr "이 메시지를 다시 보지 않습니다."
 
@@ -1730,7 +1716,9 @@ msgstr "모든 참가자에게 취소 공지를 보내시겠습니까?"
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "취소 공지를 보내지 않으면, 다른 참가자가 이 모임을 취소했다는 사실을 알지 못할 수도 있습니다."
+msgstr ""
+"취소 공지를 보내지 않으면, 다른 참가자가 이 모임을 취소했다는 사실을 알지 못"
+"할 수도 있습니다."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
@@ -1755,7 +1743,9 @@ msgstr "이 모임에 들어 있는 모든 정보를 지울 것이고 복구할
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "취소 공지를 보내지 않으면, 다른 참가자가 이 작업을 지웠다는 사실을 알지 못할 수도 있습니다."
+msgstr ""
+"취소 공지를 보내지 않으면, 다른 참가자가 이 작업을 지웠다는 사실을 알지 못할 "
+"수도 있습니다."
 
 #: ../calendar/calendar.error.xml.h:9
 #: ../calendar/gui/dialogs/delete-comp.c:196
@@ -1775,7 +1765,9 @@ msgstr "이 메모에 대한 취소 공지를 보내시겠습니까?"
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
-msgstr "취소 공지를 보내지 않으면, 다른 참가자가 이 메모를 지웠다는 사실을 알 지 못할 수도 있습니다."
+msgstr ""
+"취소 공지를 보내지 않으면, 다른 참가자가 이 메모를 지웠다는 사실을 알 지 못"
+"할 수도 있습니다."
 
 #: ../calendar/calendar.error.xml.h:13
 #: ../calendar/gui/dialogs/delete-comp.c:199
@@ -1851,14 +1843,14 @@ msgid "You have changed this meeting, but not yet saved it."
 msgstr "모임에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
 #: ../calendar/calendar.error.xml.h:30
+msgid "_Save Changes"
+msgstr "바뀐 내용 저장(_S)"
+
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "바뀐 내용 버리기(_D)"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "_Save Changes"
-msgstr "바뀐 내용 저장(_S)"
-
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "바뀐 부분을 이 약속에 저장하시겠습니까?"
@@ -1890,7 +1882,8 @@ msgstr "모임 정보를 참가자들에게 보내시겠습니까?"
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자가 응답하도록 합니다."
+msgstr ""
+"전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자가 응답하도록 합니다."
 
 #: ../calendar/calendar.error.xml.h:40
 #: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
@@ -1906,7 +1899,9 @@ msgstr "업데이트한 모임 정보를 참가자들에게 보내시겠습니
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자가 달력을 업데이트할 수 있습니다."
+msgstr ""
+"업데이트한 정보를 보내면 그걸 이용해서 다른 참가자가 달력을 업데이트할 수 있"
+"습니다."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
@@ -1916,7 +1911,9 @@ msgstr "이 작업을 참가자들에게 보내시겠습니까?"
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자가 이 작업을 수락하도록 합니다."
+msgstr ""
+"전자메일로 초대 메시지를 모든 참가자에게 보내고 참가자가 이 작업을 수락하도"
+"록 합니다."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
@@ -1930,7 +1927,7 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 작업을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "저장(_S)"
 
@@ -1954,7 +1951,9 @@ msgstr "업데이트한 작업 정보를 참가자들에게 보내시겠습니
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자가 작업 목록을 업데이트할 수 있습니다."
+msgstr ""
+"업데이트한 정보를 보내면 그걸 이용해서 다른 참가자가 작업 목록을 업데이트할 "
+"수 있습니다."
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "Editor could not be loaded."
@@ -1992,7 +1991,9 @@ msgstr "'{0}' 원격 달력을 삭제하시겠습니까?"
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "이렇게 하면 서버에서 '{0}' 달력을 완전히 제거합니다. 정말로 계속 하시겠습니까?"
+msgstr ""
+"이렇게 하면 서버에서 '{0}' 달력을 완전히 제거합니다. 정말로 계속 하시겠습니"
+"까?"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Delete remote task list '{0}'?"
@@ -2002,7 +2003,9 @@ msgstr "'{0}' 원격 작업 목록을 삭제하시겠습니까?"
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "이렇게 하면 서버에서 '{0}' 작업 목록을 완전히 제거합니다. 정말로 계속 하시겠습니까?"
+msgstr ""
+"이렇게 하면 서버에서 '{0}' 작업 목록을 완전히 제거합니다. 정말로 계속 하시겠"
+"습니까?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Delete remote memo list '{0}'?"
@@ -2012,7 +2015,9 @@ msgstr "'{0}' 원격 메모 목록을 삭제하시겠습니까?"
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "이렇게 하면 서버에서 '{0}' 메모 목록을 완전히 제거합니다. 정말로 계속 하시겠습니까?"
+msgstr ""
+"이렇게 하면 서버에서 '{0}' 메모 목록을 완전히 제거합니다. 정말로 계속 하시겠"
+"습니까?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Are you sure you want to save the appointment without a summary?"
@@ -2093,21 +2098,65 @@ msgstr "'{0}' 메모 목록을 읽어들이는데 오류"
 msgid "The memo list is not marked for offline usage."
 msgstr "메모 목록이 연결 중지 상태에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "일별 보기"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:87
+msgid "Failed to copy an event into the calendar '{0}'"
+msgstr "행사를 '{0}' 달력으로 복사하는데 실패했습니다"
 
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "근무일 주별 보기"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to copy a task into the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록으로 복사하는데 실패했습니다"
 
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "주별 보기"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to copy a memo into the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록으로 복사하는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "행사를 '{0}' 달력으로 옮기는데 실패했습니다"
 
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "월별 보기"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to move a task into the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록으로 옮기는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to move a memo into the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록으로 옮기는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Copying an event into the calendar '{0}'"
+msgstr "행사를 '%s' 달력으로 복사하는 중"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Copying a task into the task list '{0}'"
+msgstr "작업을 '%s' 작업 목록으로 복사하는 중"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Copying a memo into the memo list '{0}'"
+msgstr "메모를 '%s' 메모 목록으로 복사하는 중"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Moving an event into the calendar '{0}'"
+msgstr "행사를 '%s' 달력으로 옮기는 중"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Moving a task into the task list '{0}'"
+msgstr "작업을 '%s' 작업 목록으로 옮기는 중"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Moving a memo into the memo list '{0}'"
+msgstr "메모를 '%s' 메모 목록으로 옮기는 중"
 
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
@@ -2131,7 +2180,7 @@ msgstr "포함하지 않음"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "설명"
@@ -2157,22 +2206,27 @@ msgstr "같음"
 msgid "is not"
 msgstr "다름"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "공개"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "개인"
 
 # 비밀 옵션
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "비밀"
 
@@ -2189,7 +2243,7 @@ msgstr "참석자"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:883
+#: ../plugins/publish-calendar/publish-calendar.c:897
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
@@ -2201,8 +2255,8 @@ msgid "Category"
 msgstr "분류"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
-#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "첨부"
@@ -2218,8 +2272,8 @@ msgid "Do Not Exist"
 msgstr "존재하지 않음"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:316
-#: ../calendar/gui/dialogs/event-editor.c:337
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "반복"
@@ -2254,124 +2308,124 @@ msgid "Description Contains"
 msgstr "설명에 포함"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/alarm-dialog.c:631
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "미리 알림 편집"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "알림 팝업 창 표시"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "사운드 재생"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "프로그램 실행"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "분"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "시간"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "일"
-
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "before"
 msgstr "다음 앞에:"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
 msgid "after"
 msgstr "다음 뒤에:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "start of appointment"
 msgstr "약속 시작"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
 msgid "end of appointment"
 msgstr "약속 끝"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+msgid "minute(s)"
+msgstr "분"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "hour(s)"
+msgstr "시간"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "day(s)"
+msgstr "일"
+
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Add Reminder"
 msgstr "미리 알림 추가"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:359
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "미리 알림"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "반복"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Repeat the reminder"
 msgstr "미리 알림 반복(_R):"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "번, 주기:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "옵션"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "사용자 설정 메시지(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "메시지(_S):"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "사용자 설정 미리 알림 소리"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "소리(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "파일을 선택합니다"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "프로그램(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "인수(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "보낼 사람:"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "동작/시작 옵션"
 
@@ -2435,245 +2489,250 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "첨부를 저장할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:754
 msgid "Edit Appointment"
 msgstr "약속 편집"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Meeting - %s"
 msgstr "모임 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Appointment - %s"
 msgstr "약속 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "할당한 작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Task - %s"
 msgstr "작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Memo - %s"
 msgstr "메모 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "No Summary"
 msgstr "요약 없음"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:913
 msgid "Keep original item?"
 msgstr "본래 항목을 유지하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1108
+msgid "Unable to synchronize with the server"
+msgstr "서버와 동기화할 수 없습니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Close the current window"
 msgstr "현재 창을 닫습니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:121
 #: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
-#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:876
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "선택한 사항을 복사합니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
 #: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:883
+#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "선택한 사항을 잘라냅니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
+#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "선택한 사항을 삭제합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "View help"
 msgstr "도움말 보기"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
 #: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:911
+#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "클립보드에서 붙여 넣습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1207
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Save current changes"
 msgstr "현재 바뀐 사항 저장"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
-#: ../e-util/e-mail-signature-editor.c:312
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../e-util/e-mail-signature-editor.c:317
 msgid "Save and Close"
 msgstr "저장 후 닫기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "Save current changes and close editor"
 msgstr "현재 바뀐 사항을 저장하고 편집기를 닫습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:988
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "모든 텍스트 선택"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1299
 msgid "_Classification"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1023
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../shell/e-shell-window-actions.c:1030
+#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1327
 msgid "_Insert"
 msgstr "넣기(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:338
+#: ../calendar/gui/dialogs/comp-editor.c:1334
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
-#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-#: ../composer/e-composer-actions.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "첨부(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
-#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "파일을 첨부합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "_Categories"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "Toggles whether to display categories"
 msgstr "분류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1369
 msgid "Time _Zone"
 msgstr "표준 시간대(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "Toggles whether the time zone is displayed"
 msgstr "표준 시간대 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1309
+#: ../calendar/gui/dialogs/comp-editor.c:1380
 msgid "Pu_blic"
 msgstr "공개(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 msgid "Classify as public"
 msgstr "공개로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Private"
 msgstr "개인 정보(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Classify as private"
 msgstr "개인 정보로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1394
 msgid "_Confidential"
 msgstr "비밀(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Classify as confidential"
 msgstr "비밀로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "R_ole Field"
 msgstr "역할 항목(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether the Role field is displayed"
 msgstr "역할 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "_RSVP"
 msgstr "응답바람(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "응답요청 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Status Field"
 msgstr "상태 항목(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Status field is displayed"
 msgstr "상태 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_Type Field"
 msgstr "종류 항목(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "참석자 종류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2120
-#: ../composer/e-composer-actions.c:506
+#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2470
-#: ../calendar/gui/dialogs/comp-editor.c:2657
-#: ../calendar/gui/dialogs/comp-editor.c:3663
+#: ../calendar/gui/dialogs/comp-editor.c:2541
+#: ../calendar/gui/dialogs/comp-editor.c:2751
+#: ../calendar/gui/dialogs/comp-editor.c:3764
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3627
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3726
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3695
+#: ../calendar/gui/dialogs/comp-editor.c:3796
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
@@ -2682,19 +2741,19 @@ msgstr "현재 버전을 사용할 수 없습니다!"
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:118
+#: ../calendar/gui/dialogs/copy-source-dialog.c:121
 msgid "Could not open destination"
 msgstr "받을 곳을 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:128
+#: ../calendar/gui/dialogs/copy-source-dialog.c:131
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:162
+#: ../calendar/gui/dialogs/copy-source-dialog.c:173
 msgid "Cannot create object"
 msgstr "오브젝트를 만들 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:194
+#: ../calendar/gui/dialogs/copy-source-dialog.c:204
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
 
@@ -2786,71 +2845,71 @@ msgid "Contacts..."
 msgstr "연락처..."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "미리 알림(_R)"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-editor.c:213
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "이 행사에 미리 알림 설정 또는 해제"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "시간을 약속 있음으로 표시(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:223
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "시간을 약속 있음으로 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:232
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "반복(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "반복 행사로 만듭니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "보내기 옵션"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "고급 보내기 옵션 넣기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "하루 종일 행사(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "하루 종일 행사가 있는지 토글합니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:260
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "약속 있음/없음(_F):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/event-editor.c:262
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "약속"
 
-#: ../calendar/gui/dialogs/event-editor.c:383
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "참석자"
 
 # tooltip
-#: ../calendar/gui/dialogs/event-editor.c:580
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "이 행사를 인쇄합니다"
 
@@ -2868,7 +2927,7 @@ msgstr "행사 전체를 편집할 수 없습니다. 주최자가 아닙니다"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3181
+#: ../calendar/gui/dialogs/event-page.c:3168
 msgid "This event has reminders"
 msgstr "행사에 미리 알림이 있습니다"
 
@@ -2877,60 +2936,60 @@ msgstr "행사에 미리 알림이 있습니다"
 msgid "Or_ganizer:"
 msgstr "주최자(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1303
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1306
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/event-page.c:1479
 #: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:853
+#: ../calendar/gui/dialogs/task-page.c:1026
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1486
+#: ../calendar/gui/dialogs/event-page.c:1490
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1510
+#: ../calendar/gui/dialogs/event-page.c:1514
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1522
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1682
+#: ../calendar/gui/dialogs/event-page.c:1686
 #: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:1080
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1717
-#: ../calendar/gui/dialogs/task-page.c:942
+#: ../calendar/gui/dialogs/event-page.c:1721
+#: ../calendar/gui/dialogs/task-page.c:1115
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:1927
 msgid "_Delegatees"
 msgstr "대리인(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1925
+#: ../calendar/gui/dialogs/event-page.c:1929
 msgid "Atte_ndees"
 msgstr "참석자(_N)"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3461
+#: ../calendar/gui/dialogs/event-page.c:3448
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약속 %d일 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3467
+#: ../calendar/gui/dialogs/event-page.c:3454
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -2938,18 +2997,18 @@ msgstr[0] "약속 %d시간 전에"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3473
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약속 %d분 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3494
+#: ../calendar/gui/dialogs/event-page.c:3481
 msgid "Customize"
 msgstr "사용자 지정"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3501
+#: ../calendar/gui/dialogs/event-page.c:3488
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "없음"
@@ -3000,8 +3059,8 @@ msgstr "위치(_L):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../e-util/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "설명(_D):"
 
@@ -3010,7 +3069,7 @@ msgid "_Time:"
 msgstr "시간(_T):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "표준 시간대(_Z):"
 
@@ -3023,8 +3082,8 @@ msgid "Event Description"
 msgstr "행사 설명"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "참석자(_N)..."
 
@@ -3091,11 +3150,11 @@ msgid "Select Date"
 msgstr "날짜 선택"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Select _Today"
 msgstr "오늘 선택(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "메모"
 
@@ -3115,23 +3174,23 @@ msgstr "메모를 편집할 수 없습니다. 선택한 메모 목록이 읽기
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "메모 전체를 편집할 수 없습니다. 주최자가 아닙니다"
 
-#: ../calendar/gui/dialogs/memo-page.c:1183
-#: ../em-format/e-mail-formatter.c:1391
-#: ../em-format/e-mail-formatter-utils.c:194
-#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
+#: ../calendar/gui/dialogs/memo-page.c:1160
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "받는 사람"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:336
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "목록(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:344
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "주최자(_Z):"
 
@@ -3140,12 +3199,12 @@ msgid "T_o:"
 msgstr "받는 사람(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "시작 날짜(_R):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "개요(_M):"
 
@@ -3187,21 +3246,21 @@ msgstr "이 경우 및 앞으로의 경우"
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:573
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 에볼루션에서 편집할 수 있는 반복이 들어 있습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "반복하는 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "End time of the recurrence was before event's start"
 msgstr "반복 끝나는 시각이 행사 시작보다 앞 시각입니다."
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "요일"
 
@@ -3209,7 +3268,7 @@ msgstr "요일"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "첫번째"
 
@@ -3218,7 +3277,7 @@ msgstr "첫번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "두번째"
 
@@ -3226,7 +3285,7 @@ msgstr "두번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "세번째"
 
@@ -3234,7 +3293,7 @@ msgstr "세번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "네번째"
 
@@ -3242,7 +3301,7 @@ msgstr "네번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "다섯번째"
 
@@ -3250,13 +3309,13 @@ msgstr "다섯번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1136
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "마지막"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "기타 날짜"
 
@@ -3264,7 +3323,7 @@ msgstr "기타 날짜"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1일부터 10일"
 
@@ -3272,7 +3331,7 @@ msgstr "1일부터 10일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11일부터 20일"
 
@@ -3280,42 +3339,42 @@ msgstr "11일부터 20일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21일부터 31일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "월요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "화요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1207
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "수요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "목요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "금요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "토요일"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "일요일"
 
@@ -3324,33 +3383,33 @@ msgstr "일요일"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1342
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "기간:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1527
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "번"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2253
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "예외 추가"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "고칠 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "예외 수정"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "지울 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2488
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "날짜/시각"
 
@@ -3429,191 +3488,168 @@ msgid "Preview"
 msgstr "미리 보기"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/send-comp.c:223
+#: ../calendar/gui/dialogs/send-comp.c:173
+#: ../calendar/gui/dialogs/send-comp.c:255
 msgid "Send my reminders with this event"
 msgstr "이 행사에 내 미리 알림 보내기"
 
-#: ../calendar/gui/dialogs/send-comp.c:225
+#: ../calendar/gui/dialogs/send-comp.c:175
+#: ../calendar/gui/dialogs/send-comp.c:257
 msgid "Notify new attendees _only"
 msgstr "새 참석자에게만 알림(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "보내기 옵션(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "작업"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "이 작업 인쇄"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
+msgstr "작업의 시작 날짜가 과거입니다"
+
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr "작업의 마감 날짜가 과거입니다"
+
+#: ../calendar/gui/dialogs/task-page.c:364
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "작업을 편집할 수 없습니다. 선택한 작업 목록이 읽기 전용입니다"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "작업 전체를 편집할 수 없습니다. 주최자가 아닙니다"
+
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"작업을 편집할 수 없습니다. 선택한 작업 목록이 할당된 작업을 지원하지 않습니다"
+
+#: ../calendar/gui/dialogs/task-page.c:1007
+msgid "Due date is wrong"
+msgstr "마감 날짜가 잘못되었습니다"
+
+#: ../calendar/gui/dialogs/task-page.c:1175
+#: ../calendar/gui/dialogs/task-page.c:1200
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-details-page.c:490
-msgid "Web Page"
-msgstr "웹 페이지"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:348
-#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:345
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "높음"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:350
-#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/dialogs/task-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:347
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:1256
+#: ../mail/message-list.c:319
 msgid "Normal"
 msgstr "보통"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:352
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
+#: ../calendar/gui/dialogs/task-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:349
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "낮음"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "정의안됨"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:333
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
-#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "시작 안함"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3557
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:320
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "진행중"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:557
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "완료됨"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model-tasks.c:497
-#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "취소함"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3520
-#: ../calendar/gui/e-meeting-list-view.c:692
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "상태"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
-msgstr "상태(_U):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
-msgstr "퍼센트 완료(_E):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "우선순위(_P):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "완료한 날짜(_D):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
-msgid "_Web Page:"
-msgstr "웹 페이지(_W):"
-
-#: ../calendar/gui/dialogs/task-editor.c:113
-msgid "_Status Details"
-msgstr "상태 자세히(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:115
-msgid "Click to change or view the status details of the task"
-msgstr "누르면 작업의 자세한 상태 정보를 바꾸거나 봅니다"
-
-#: ../calendar/gui/dialogs/task-editor.c:123
-msgid "_Send Options"
-msgstr "보내기 옵션(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "작업"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "마감 날짜(_U):"
 
-#: ../calendar/gui/dialogs/task-editor.c:304
-msgid "Task Details"
-msgstr "작업 자세히"
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "표준 시간대:"
 
-#: ../calendar/gui/dialogs/task-editor.c:348
-msgid "Print this task"
-msgstr "이 작업 인쇄"
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
+msgstr "상태(_S):"
 
-#: ../calendar/gui/dialogs/task-page.c:249
-msgid "Task's start date is in the past"
-msgstr "작업의 시작 날짜가 과거입니다"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+msgid "Date _completed:"
+msgstr "완료한 날짜(_C):"
 
-#: ../calendar/gui/dialogs/task-page.c:250
-msgid "Task's due date is in the past"
-msgstr "작업의 마감 날짜가 과거입니다"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_Percent complete:"
+msgstr "퍼센트 완료(_P):"
 
-#: ../calendar/gui/dialogs/task-page.c:283
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "작업을 편집할 수 없습니다. 선택한 작업 목록이 읽기 전용입니다"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
+msgstr "우선 순위(_Y):"
 
-#: ../calendar/gui/dialogs/task-page.c:287
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "작업 전체를 편집할 수 없습니다. 주최자가 아닙니다"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "분류(_L):"
 
-#: ../calendar/gui/dialogs/task-page.c:291
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"작업을 편집할 수 없습니다. 선택한 작업 목록이 할당된 작업을 지원하지 않습니다"
-
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "마감 날짜가 잘못되었습니다"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "마감 날짜(_U):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "표준 시간대:"
+#: ../calendar/gui/dialogs/task-page.ui.h:37
+msgid "_Web Page:"
+msgstr "웹 페이지(_W):"
 
 #: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
@@ -3665,7 +3701,7 @@ msgstr "달력 이벤트: 요약 없음."
 msgid "calendar view event"
 msgstr "달력 보기 이벤트"
 
-#: ../calendar/gui/ea-cal-view-event.c:566
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "포커스 받음"
 
@@ -3713,7 +3749,7 @@ msgid "Gnome Calendar"
 msgstr "그놈 달력"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1143
+#: ../modules/calendar/e-cal-shell-view-private.c:1225
 msgid "%A %d %b %Y"
 msgstr "%Y년 %b %d일 %A"
 
@@ -3723,19 +3759,19 @@ msgstr "%Y년 %b %d일 %A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1147
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
 msgid "%a %d %b"
 msgstr "%b %d일 (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1159
+#: ../modules/calendar/e-cal-shell-view-private.c:1232
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %d일 (%a)"
 
@@ -3743,10 +3779,10 @@ msgstr "%Y년 %b %d일 (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1176
-#: ../modules/calendar/e-cal-shell-view-private.c:1187
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1258
+#: ../modules/calendar/e-cal-shell-view-private.c:1269
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
+#: ../modules/calendar/e-cal-shell-view-private.c:1279
 msgid "%d %b %Y"
 msgstr "%Y년 %b %d일"
 
@@ -3755,10 +3791,10 @@ msgstr "%Y년 %b %d일"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1183
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1265
 msgid "%d %b"
 msgstr "%b %d일"
 
@@ -3856,47 +3892,47 @@ msgstr "한 달 단위로 달력 보기"
 msgid "calendar view for one or more weeks"
 msgstr "주 단위로 달력 보기"
 
-#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
+#: ../calendar/gui/e-cal-component-preview.c:231 ../e-util/e-filter-rule.c:750
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Categories:"
 msgstr "분류:"
 
-#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Summary:"
 msgstr "요약:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:280
 msgid "Start Date:"
 msgstr "시작 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:292
 msgid "End Date:"
 msgstr "끝 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Due Date:"
 msgstr "마감 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../modules/itip-formatter/itip-view.c:1467
-#: ../modules/itip-formatter/itip-view.c:1584
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "상태:"
 
-#: ../calendar/gui/e-cal-component-preview.c:346
+#: ../calendar/gui/e-cal-component-preview.c:343
 msgid "Priority:"
 msgstr "우선 순위:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:368
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "설명:"
 
-#: ../calendar/gui/e-cal-component-preview.c:402
+#: ../calendar/gui/e-cal-component-preview.c:399
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
@@ -3909,7 +3945,7 @@ msgid "Start date"
 msgstr "시작 날짜"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:649
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:586
@@ -3940,6 +3976,17 @@ msgstr "% 완료"
 msgid "Priority"
 msgstr "우선순위"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "상태"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
@@ -3953,37 +4000,37 @@ msgstr "만듦"
 msgid "Last modified"
 msgstr "최근 바뀜"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Cut selected events to the clipboard"
 msgstr "선택한 행사를 클립보드로 잘라냅니다"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Copy selected events to the clipboard"
 msgstr "선택한 행사를 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-calendar-view.c:450
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Paste events from the clipboard"
 msgstr "클립보드에서 행사를 붙여 넣습니다"
 
-#: ../calendar/gui/e-calendar-view.c:456
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Delete selected events"
 msgstr "선택한 행사를 삭제합니다"
 
-#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
 #: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 삭제하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "주최자: %s <%s>"
@@ -3991,21 +4038,21 @@ msgstr "주최자: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:545
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "주최자: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2019
-#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
+#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2050
+#: ../calendar/gui/e-calendar-view.c:2135
 #, c-format
 msgid "Time: %s %s"
 msgstr "시간: %s %s"
@@ -4019,81 +4066,81 @@ msgstr "시작 날짜"
 msgid "End Date"
 msgstr "끝 날짜"
 
-#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
-#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3474
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6080
 #: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../calendar/gui/e-cal-model.c:1683
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "반복됨"
 
-#: ../calendar/gui/e-cal-model.c:1685
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
 #: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:1074
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "예"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
 #: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "아니요"
 
-#: ../calendar/gui/e-cal-model.c:3461
+#: ../calendar/gui/e-cal-model.c:3958
 #: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:6068
 msgid "Accepted"
 msgstr "수락"
 
-#: ../calendar/gui/e-cal-model.c:3462
+#: ../calendar/gui/e-cal-model.c:3959
 #: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:6074
 msgid "Declined"
 msgstr "거부"
 
-#: ../calendar/gui/e-cal-model.c:3463
+#: ../calendar/gui/e-cal-model.c:3960
 #: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "잠정적"
 
-#: ../calendar/gui/e-cal-model.c:3464
+#: ../calendar/gui/e-cal-model.c:3961
 #: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6077
 msgid "Delegated"
 msgstr "대리"
 
-#: ../calendar/gui/e-cal-model.c:3465
+#: ../calendar/gui/e-cal-model.c:3962
 msgid "Needs action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-cal-model-calendar.c:158
-#: ../calendar/gui/e-task-table.c:629
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 msgid "Free"
 msgstr "약속 없음"
 
-#: ../calendar/gui/e-cal-model-calendar.c:161
-#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "약속 있음"
 
-#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-cal-model-tasks.c:499
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4104,7 +4151,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-cal-model-tasks.c:551
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "없음"
@@ -4129,16 +4176,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
-#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
-#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
-#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
-#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "오후"
 
@@ -4148,13 +4195,13 @@ msgstr "오후"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1871 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%B %d일 %A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2709
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "%d주"
@@ -4165,27 +4212,27 @@ msgstr "%d주"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:794
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
 
-#: ../calendar/gui/e-day-view-time-item.c:819
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "보조 표준 시간대 표시"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:836
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "없음"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:877
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "선택..."
 
@@ -4206,153 +4253,153 @@ msgid "Resources"
 msgstr "자원"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "개인"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "모음"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1233
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "자원"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:1234
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "방"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "의장"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "필수 참석자"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "선택 참석자"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "불참자"
 
 #: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../calendar/gui/e-meeting-store.c:1081
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:678
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "응답바람"
 
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "진행중"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-store.c:1955
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "서버 %s에 %s 사용자로 약속 있음/없음 정보에 접근할 암호를 입력하십시오."
 
-#: ../calendar/gui/e-meeting-store.c:1965
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "실패 이유: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1970
-#: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:351
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
 
-#: ../calendar/gui/e-meeting-time-sel.c:580
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "부재 중"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "정보 없음"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "옵션(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "근무 시간만 보이기(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:655
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "축소해서 보이기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:690
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:748
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:759
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:770
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:780
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:834
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:878
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2786
+#: ../calendar/gui/e-meeting-time-sel.c:2660
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4361,7 +4408,7 @@ msgstr ""
 "요약: %s\n"
 "위치: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "요약: %s"
@@ -4390,46 +4437,46 @@ msgstr "공통 이름"
 msgid "Language"
 msgstr "언어"
 
-#: ../calendar/gui/e-memo-table.c:421
-#: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "메모"
 
-#: ../calendar/gui/e-memo-table.c:502 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* 요약 없음 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "시작: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "기한: "
 
-#: ../calendar/gui/e-memo-table.c:727
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "선택한 메모를 클립보드로 잘라 냅니다"
 
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "선택한 메모를 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "클립보드에서 메모를 붙여 넣습니다"
 
-#: ../calendar/gui/e-memo-table.c:745
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "선택한 메모를 삭제합니다"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "보이는 모든 메시지 선택"
 
@@ -4441,40 +4488,40 @@ msgstr "메모를 추가하려면 누르십시오"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:602
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "작업"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "선택한 작업을 클립보드로 잘라냅니다"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "선택한 작업을 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "클립보드에서 작업을 붙여 넣습니다"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "선택한 작업을 삭제합니다"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "보이는 모든 작업 선택"
 
@@ -4485,42 +4532,42 @@ msgstr "표준 시간대를 선택하십시오"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:241 ../calendar/gui/print.c:2050
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%B %d일"
 
-#: ../calendar/gui/gnome-cal.c:2319
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr "비우는 중"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "주최자를 결정해야 합니다."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "참석자가 최소한 한 사람은 필요합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "행사 정보"
 
-#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "메모 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "약속 있음/없음 정보"
 
-#: ../calendar/gui/itip-utils.c:917
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "달력 정보"
 
@@ -4528,7 +4575,7 @@ msgstr "달력 정보"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:954
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "수락"
@@ -4537,7 +4584,7 @@ msgstr "수락"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:961
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
@@ -4549,7 +4596,7 @@ msgstr "잠정적으로 수락"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:968 ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "거절"
@@ -4558,7 +4605,7 @@ msgstr "거절"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "대리"
@@ -4566,7 +4613,7 @@ msgstr "대리"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:988
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "업데이트됨"
@@ -4574,7 +4621,7 @@ msgstr "업데이트됨"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:995
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "취소"
@@ -4583,7 +4630,7 @@ msgstr "취소"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1002
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "새로운 사항"
@@ -4591,192 +4638,201 @@ msgstr "새로운 사항"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "반대제안"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "약속 있음/없음 정보 (%s부터 %s까지)"
 
-#: ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendar 정보"
 
-#: ../calendar/gui/itip-utils.c:1122
+#: ../calendar/gui/itip-utils.c:1144
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "리소스를 예약할 수 없습니다. 새 행사가 다른 행사와 충돌합니다."
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1152
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "리소스를 예약할 수 없습니다. 오류는: %s"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1304
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "이 행사의 참석자여야 합니다."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1일"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2일"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3일"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4일"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5일"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6일"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7일"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8일"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9일"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10일"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11일"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12일"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13일"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14일"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31일"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:721
-msgid "Su"
-msgstr "일"
-
-#: ../calendar/gui/print.c:721
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "월"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "화"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "수"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "목"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "금"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "토"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "일"
+
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr "부터 "
 
@@ -4784,21 +4840,21 @@ msgstr "부터 "
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3306
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3312
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3354
 msgid " (Due "
 msgstr " (기한 "
 
@@ -4806,40 +4862,40 @@ msgstr " (기한 "
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/print.c:3527
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "참석자: "
 
-#: ../calendar/gui/print.c:3571
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: ../calendar/gui/print.c:3587
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: ../calendar/gui/print.c:3605
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %i"
 
-#: ../calendar/gui/print.c:3619
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: ../calendar/gui/print.c:3644
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "연락처:"
 
@@ -4847,10 +4903,6 @@ msgstr "연락처:"
 msgid "In progress"
 msgstr "진행 중"
 
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "취소함"
-
 #: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
 msgid "% Completed"
@@ -4906,25 +4958,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "에볼루션 달력 똑똑한 가져오기"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "모임"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "행사"
 
 #: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "작업"
 
 #: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "메모"
@@ -4977,7 +5029,7 @@ msgstr "등급"
 
 #. Translators: Appointment's summary
 #: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1549
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "요약"
@@ -4990,7 +5042,7 @@ msgstr "위치"
 
 #. Translators: Appointment's start time
 #: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "시작"
@@ -5044,7 +5096,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "설명"
 
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "형태"
@@ -6599,165 +6651,165 @@ msgstr "태평양/월리스"
 msgid "Pacific/Yap"
 msgstr "태평양/얍"
 
-#: ../composer/e-composer-actions.c:207
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../composer/e-composer-actions.c:294
-#: ../e-util/e-mail-signature-editor.c:303
+#: ../composer/e-composer-actions.c:276
+#: ../e-util/e-mail-signature-editor.c:308
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "현재 파일을 닫습니다"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "새 메시지(_M)"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "새 메시지 창을 엽니다"
 
-#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "에볼루션 설정"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "현재 파일을 저장합니다"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "다른 이름으로 저장(_A)..."
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "현재 파일을 다른 이름으로 저장합니다"
 
-#: ../composer/e-composer-actions.c:331
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "문자 인코딩(_E)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "인쇄 미리 보기(_V)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "임시 보관함에 저장(_D)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "임시 보관함에 저장"
 
-#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "보내기(_E)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "이 메시지를 지금 보냅니다"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP 암호화(_E)"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "이 메시지를 PGP로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP 서명(_S)"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "이 메시지를 PGP키로 서명합니다"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "사진 갤러리(_P)"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "메시지에 끌어 놓을 사진 모음을 표시합니다"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "메시지 우선순위 높이기(_P)"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "메시지 우선순위를 높입니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "내용 읽음 확인 요청(_Q)"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr "메시지를 읽으면 배달 확인 받기"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 암호화(_C)"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "이 메시지를 S/MIME 암호화 인증서로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 서명(_N)"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "이 메시지를 S/MIME 서명 증명으로 서명합니다"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "숨은 참조 항목(_B)"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "숨은 참조 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "참조 항목(_C)"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "참조 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
-msgstr "회신 주소 항목(_R)"
+msgstr "답장 주소 항목(_R)"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "회신 주소 항목을 표시할지 토글합니다"
+msgstr "답장 주소 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "임시 저장"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "메시지를 받을 사람을 입력하십시오"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "메시지의 사본을 받을 사람의 주소를 입력하십시오"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6765,36 +6817,36 @@ msgstr ""
 "메시지의 받는 사람 목록에 나타나지 않고 참조 메시지를 받을 주소를 입력하십시"
 "오."
 
-#: ../composer/e-composer-header-table.c:835
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "보낸 사람(_O):"
 
-#: ../composer/e-composer-header-table.c:842
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
-msgstr "회신 주소(_R):"
+msgstr "답장 주소(_R):"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "받는 사람(_T):"
 
-#: ../composer/e-composer-header-table.c:853
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "참조(_C):"
 
-#: ../composer/e-composer-header-table.c:859
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "숨은 참조(_B):"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-header-table.c:864
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "게시 위치(_P):"
 
-#: ../composer/e-composer-header-table.c:868
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "제목(_U):"
 
-#: ../composer/e-composer-header-table.c:876
+#: ../composer/e-composer-header-table.c:813
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "서명(_G):"
@@ -6807,11 +6859,7 @@ msgstr "주소록을 보려면 누르십시오"
 msgid "Click here to select folders to post to"
 msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 
-#: ../composer/e-composer-private.c:347
-msgid "Save draft"
-msgstr "임시 저장"
-
-#: ../composer/e-msg-composer.c:862
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6819,7 +6867,7 @@ msgstr ""
 "보내는 메시지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6828,17 +6876,17 @@ msgstr ""
 "보내는 메시지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "메시지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:4215
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "메일 작성에 텍스트가 아닌 메시지 본문이 들어 있습니다. 이 메시지 본문은 편집"
 "할 수 없습니다."
 
-#: ../composer/e-msg-composer.c:4890
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "제목 없는 메시지"
 
@@ -6967,7 +7015,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "보내는 중에 오류가 발생했습니다. 어떻게 계속 하시겠습니까?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "확인된 오류는 &quot;{0}&quot;입니다."
 
@@ -6989,12 +7037,10 @@ msgstr "메시지를 보낼 편지함에 저장하는 중입니다."
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
-msgstr ""
-"연결 중지 상태이므로 이 메시지는 보낼 편지함 폴더에 저장합니다. 연결 상태로 "
-"돌아오면 도구 모음의 보내기/받기 단추를 눌러 메시지를 보낼 수 있습니다."
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
+msgstr "해당 메일 서비스를 지금 사용할 수 없으므로, 이 메시지는 보낼 편지함 폴더에 저장합니다. 에볼루션 도구 모음에서 보내기/받기 단추를 누르면 메시지를 보낼 수 있습니다."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7004,8 +7050,8 @@ msgstr "에볼루션 알림"
 msgid "Calendar event notifications"
 msgstr "달력 행사 알림"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "에볼루션"
@@ -7024,15 +7070,9 @@ msgstr "전자메일, 연락처, 일정을 관리합니다"
 
 #: ../data/evolution.desktop.in.in.h:5
 msgid "mail;calendar;contact;addressbook;task;"
-msgstr "mail;메일;편지;calendar;달력;캘린더;contact;연락처;addressbook;주소록;task;작업;할일;"
-
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Email Settings"
-msgstr "전자메일 설정"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "전자메일 계정 설정"
+msgstr ""
+"mail;메일;편지;calendar;달력;캘린더;contact;연락처;addressbook;주소록;task;작"
+"업;할일;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -7607,7 +7647,9 @@ msgstr "오늘 마감인 작업의 색"
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
-msgstr "오늘 마감인 작업의 배경색 (\"#rrggbb\" 형식), task-due-today-highlight와 같이 사용"
+msgstr ""
+"오늘 마감인 작업의 배경색 (\"#rrggbb\" 형식), task-due-today-highlight와 같"
+"이 사용"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
@@ -7652,7 +7694,9 @@ msgstr "마감이 지난 작업 색"
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
-msgstr "마감이 지난 작업의 배경색 (\"#rrggbb\" 형식), task-overdue-highlight와 같이 사용."
+msgstr ""
+"마감이 지난 작업의 배경색 (\"#rrggbb\" 형식), task-overdue-highlight와 같이 "
+"사용."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
@@ -7711,20 +7755,57 @@ msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "에볼루션에서 선택한 표준 시간대가 아니라 시스템 표준 시간대를 사용"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "시작 요일"
+msgid "First day of the week"
+msgstr "한 주의 첫 번째 요일"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "한 주가 시작하는 요일, 일요일(0)에서 토요일(6)"
+msgid "Monday is a work day"
+msgstr "월요일이 근무 요일"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "근무 요일"
+msgid "Tuesday is a work day"
+msgstr "화요일이 근무 요일"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "근무 시작/끝 시간을 지정할 날"
+msgid "Wednesday is a work day"
+msgstr "수요일이 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "목요일이 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "금요일이 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "토요일이 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "일요일이 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "(없어질 예정) 한 주가 시작하는 요일, 일요일(0)에서 토요일(6)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"week-start-day-name\" 키를 사용하십시오."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(없어질 예정) 근무 요일"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr "근무 시간을 지정할 요일. (이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"week-day-monday\", 
\"week-day-tuesday\" 등 키를 사용하십시오.)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
@@ -7846,7 +7927,7 @@ msgstr "인용 메시지"
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
-msgstr "메시지에 회신할 때, 메시지의 원저자를 표시하는 텍스트"
+msgstr "메시지에 답장할 때, 메시지의 원저자를 표시하는 텍스트"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Forward message"
@@ -7867,13 +7948,11 @@ msgstr "원문 메시지"
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
-msgstr ""
-"메시지에 회신할 때(위에 답장 내용을 쓸 경우), 다음 내용이 원본 메시지라는 사"
-"실을 안내하는 텍스트"
+msgstr "메시지에 답장할 때(위에 답장 내용을 쓸 경우), 다음 내용이 원본 메시지라는 사실을 안내하는 텍스트"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Group Reply replies to list"
-msgstr "그룹 회신을 설정하면 리스트로 회신합니다"
+msgstr "그룹 답장을 설정하면 리스트로 답장합니다"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
@@ -7881,22 +7960,18 @@ msgid ""
 "'Group Reply' toolbar button try to reply only to the mailing list through "
 "which you happened to receive the copy of the message to which you're "
 "replying."
-msgstr ""
-"일반 \"전체 회신\" 동작과는 다르게, 이 옵션을 사용하면 \"그룹 회신\" 도구 모"
-"음 단추를 사용했을 때 원본 메일의 해당 메일링 리스트에만 답장합니다."
+msgstr "일반 \"전체 답장\" 동작과는 다르게, 이 옵션을 사용하면 \"그룹 답장\" 도구 모음 단추를 사용했을 때 원본 메일의 해당 메일링 리스트에만 답장합니다."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Put the cursor at the bottom of replies"
-msgstr "커서를 회신 맨 아래에 놓습니다"
+msgstr "커서를 답장 맨 아래에 놓습니다"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
-msgstr ""
-"메세지에 회신을 할 때 커서가 갈 위치. 이 값은 커서를 메시지의 맨 위에 놓을지 "
-"맨 아래에 놓을지 결정합니다."
+msgstr "메세지에 답장을 할 때 커서가 갈 위치. 이 값은 커서를 메시지의 맨 위에 놓을지 맨 아래에 놓을지 결정합니다."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
@@ -7957,14 +8032,14 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "메일 메시지를 보낼 때 \"회신 주소\" 필드 표시"
+msgstr "메일 메시지를 보낼 때 \"답장 주소\" 필드 표시"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"메일 메시지를 보낼 때 \"회신 주소\" 필드를 표시합니다. 이 옵션은 메일 계정이 "
+"메일 메시지를 보낼 때 \"답장 주소\" 필드를 표시합니다. 이 옵션은 메일 계정이 "
 "있을 때 보기 메뉴에서 선택합니다."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
@@ -7981,14 +8056,14 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "뉴스그룹에 글을 쓸 때 \"회신 주소\" 필드 표시"
+msgstr "뉴스그룹에 글을 쓸 때 \"답장 주소\" 필드 표시"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
-"뉴스그룹에 글을 쓸 때 \"회신 주소\" 필드를 표시합니다. 이 옵션은 뉴스 계정이 "
+"뉴스그룹에 글을 쓸 때 \"답장 주소\" 필드를 표시합니다. 이 옵션은 뉴스 계정이 "
 "있을 때 보기 메뉴에서 선택합니다."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
@@ -8000,7 +8075,7 @@ msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 msgstr ""
-"PGP나 S/MIME 서명된 메시지에 회신할 때 자동으로 PGP나 S/MIME 서명 사용."
+"PGP나 S/MIME 서명된 메시지에 답장할 때 자동으로 PGP나 S/MIME 서명 사용."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Encode filenames in an Outlook/GMail way"
@@ -8020,16 +8095,14 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
-msgstr "회신 맨 위에 개인 서명을 넣습니다"
+msgstr "답장 위에 개인 서명을 넣습니다"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
-msgstr ""
-"메세지에 회신을 할 때 서명이 갈 위치. 이 값은 서명을 메시지의 맨 위에 놓을지 "
-"맨 아래에 놓을지 결정합니다."
+msgstr "메세지에 답장을 할 때 서명이 갈 위치. 이 값은 서명을 메시지의 맨 위에 놓을지 맨 아래에 놓을지 결정합니다."
 
 # 메일의 서명 앞에 들어 있는 '--' 따위
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
@@ -8057,10 +8130,10 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
-"일부 메일링 리스트는 Reply-To: 헤더를 붙여서 사용자가 개인 회신을 할 경우에"
-"도 리스트로 회신을 보내도록 유도합니다. 이 옵션을 참으로 설정하면 그러한 "
+"일부 메일링 리스트는 Reply-To: 헤더를 붙여서 사용자가 개인 답장을 할 경우에"
+"도 리스트로 답장을 보내도록 유도합니다. 이 옵션을 참으로 설정하면 그러한 "
 "Reply-To: 헤더를 무시하고, 의도한 대로 에볼루션의 기능이 동작합니다. 개인 회"
-"신을 할 경우는 개인 회신을 하고, '리스트에 회신'을 할 경우 리스트에 회신을 합"
+"신을 할 경우는 개인 답장을 하고, '리스트에 답장'을 할 경우 리스트에 답장을 합"
 "니다. 이 기능은 Reply-To: 헤더를 List-Post: 헤더와 비교하는 식으로 동작합니"
 "다."
 
@@ -8086,50 +8159,36 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr "'mbox' 또는 'pdf'가 가능."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "끌어놓기 작업에 사용할 파일 이름 포맷"
+msgid "Show image animations"
+msgstr "그림 애니메이션 보기"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
-"값이 2이면 현재 날짜와 시각이고, 기타 메시지 보낸 시각 값이 될 수도 있습니"
-"다. 이 값은 한 개의 메시지를 끌어 놓았을 경우에만 의미가 있습니다."
+"HTML 메일에서 애니메이션을 허용합니다. 많은 사용자는 애니메이션 그림을 좋아하"
+"지 않고 정지된 그림을 보고 싶어합니다."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Show image animations"
-msgstr "그림 애니메이션 보기"
+msgid "Ellipsize mode for folder names in side bar"
+msgstr "가장자리 창에서 폴더 이름 줄여 쓰기 모드"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr "HTML 메일에서 애니메이션을 허용합니다. 많은 사용자는 애니메이션 그림을 좋아하지 않고 정지된 그림을 보고 싶어합니다."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "텍스트 입력 미리 검색 기능 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "가장자리 창에서 폴더 이름을 검색할 수 있게 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "가장자리 창의 폴더 이름 줄여 쓰기 사용을 막을지 여부"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "가장자리 창의 폴더 이름에 대해 줄여 쓰기 사용을 막을지 여부."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "만능 스페이스바 사용 여부"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8137,136 +8196,114 @@ msgstr ""
 "이 기능을 사용하면 스페이스바 키를 이용해 메시지 미리 보기, 메시지 목록, 폴더"
 "를 스크롤합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "이 기능을 사용하면 모든 폴더에 비슷한 메시지 목록 보기 설정을 사용합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "이 기능을 사용하면 모든 폴더에 비슷한 메시지 목록 보기 설정을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "인용문 강조 색"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "인용문 강조 색."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "캐릿 모드를 켭니다, 이 모드에서는 메일을 읽을 때 커서가 보입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "메시지를 표시할 기본 문자셋"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "메시지를 표시할 기본 문자셋."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "HTTP를 통해 HTML 메시지의 그림을 읽어들입니다"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"HTTP(S)를 통해 HTML 메시지의 그림을 읽어들입니다. 사용 가능한 값은: \"0\" - "
-"네트워크에서 그림을 읽어들이지 않습니다. \"1\" - 주소록에 있는 사람의 메세지 "
-"그림을 읽어들입니다. \"2\" - 항상 네트워크에서 그림을 읽어들입니다."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "HTTP를 통해 HTML 메시지의 그림을 자동으로 읽어들입니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "애니메이션 보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show animated images as animations."
 msgstr "애니메이션이 들어 있는 그림을 애니메이션으로 봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all message headers"
 msgstr "모든 메시지 헤더 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "메시지를 볼 때 모든 헤더를 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "사용자 지정 헤더와 그 헤더를 사용할지 여부의 목록."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "List of headers to show when viewing a message."
+msgstr "메시지를 볼 때 표시할 헤더 목록."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"이 키에는 사용자 지정 헤더와 그 헤더를 표시할지 여부를 지정하는 XML 구조의 리"
-"스트가 들어 있습니다. XML 구조의 형식은 &lt;header enabled&gt;입니다 - 헤더"
-"를 메일 보기에서 표시하면 enabled로 설정합니다."
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+msgstr "헤더마다 해당하는 다음 쌍이 있습니다; 헤더 이름 및 그 헤더를 사용할지 여부를 나타내는 불리언 값. 사용하지 않는 헤더는 메시지를 볼 때 표시하지 않지만, 기본 설정에는 여전히 
있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show photo of the sender"
 msgstr "보낸 사람의 사진을 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "메시지 읽기 창에서 보낸 사람의 사진을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "로컬 주소록에서 보낸 사람 사진 검색"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "이 옵션으로 가져오기 속도를 높일 수 있습니다."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout for marking messages as seen"
 msgstr "메시지를 읽은 것으로 표시하는 경과 시간"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "메시지를 읽은 것으로 표시하는 경과 시간, 밀리초 단위."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "메시지 목록의 보낸 사람 전자메일 주소 열"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "메시지 목록의 별도 열에 보낸 사람의 전자메일을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8274,7 +8311,7 @@ msgstr ""
 "세로 보기의 \"메시지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8282,19 +8319,19 @@ msgstr ""
 "세로 보기의 \"메시지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할지 결정합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "메시지 목록에 삭제한 메시지를 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "메시지 목록에 삭제한 메시지를 표시합니다(취소선을 긋습니다)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable Unmatched search folder"
 msgstr "해당 없음 검색 폴더 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8302,11 +8339,11 @@ msgstr ""
 "검색 폴더에서 해당 없음 검색 폴더를 사용합니다. 검색 폴더를 사용하지 않으면 "
 "아무 일도 하지 않습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "폴더별 미리 보기를 감추고 선택을 없앱니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8314,39 +8351,31 @@ msgstr ""
 "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록에서 메일 선택"
 "을 제거하고 그 폴더에 대한 미리 보기를 없앱니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "메시지 목록 창의 높이"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "메시지 목록 창의 높이."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "State of message headers in paned view"
-msgstr "창 분리 보기에서 메시지 헤더 상태"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
-"메시지 헤더를 기본값에서 축소할지 확장할지 결정합니다. \"0\" = 확장, \"1\" = "
-"축소"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
+msgstr "인터페이스에 메시지 헤더를 접을지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "메시지 목록 창의 너비"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "메시지 목록 창의 너비."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "배치 방식"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8357,35 +8386,35 @@ msgstr ""
 "\"0\"은(전통적 방식) 미리 보기 창을 메시지 목록 아래에 둡니다. \"1\"은(세로 "
 "보기) 미리 보기 창을 메시지 목록 옆에 나란히 둡니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "메일을 표시할 때 사용할 가변폭 글꼴."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "메일을 표시할 때 사용할 터미널 글꼴."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "메일을 표시할 때 사용자 지정 글꼴을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조의 주소를 간략하게 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8393,11 +8422,11 @@ msgstr ""
 "받는 사람/참조/숨은 참조의 주소를 address_count에 지정한 개수만큼 간략하게 표"
 "시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조에 표시할 주소의 길이"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8405,11 +8434,11 @@ msgstr ""
 "기본 메시지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "제목에 따라 메시지 목록을 글타래 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8417,11 +8446,11 @@ msgstr ""
 "메시지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
 "래 표시를 할 것인지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "글타래 확장 상태에 대한 기본값"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8429,11 +8458,11 @@ msgstr ""
 "이 설정은 글타래를 기본값으로 펼친 상태로 할지 접힌 상태로 할지 지정합니다. "
 "에볼루션을 다시 시작해야 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할지 여부"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8442,11 +8471,11 @@ msgstr ""
 "이 설정은 해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할지 여부를 지정"
 "합니다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "폴더 구조에서 계정을 사전 순서대로 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8457,27 +8486,27 @@ msgstr ""
 "순서대로 정렬합니다. 단, \"이 컴퓨터\"와 \"검색\" 폴더는 예외입니다. 거짓이"
 "면 계정을 사용자가 지정한 순서대로 정렬합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "필터 동작 기록"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 필터 동작을 기록합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "필터 동작을 기록할 로그 파일"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "필터 동작을 기록할 로그 파일입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr "필터링 후에 보낸 편지함 플러시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -8487,40 +8516,44 @@ msgstr ""
 "달' 필터 동작을 사용했을 경우 및 마지막 동작을 실행한 후 약 1분 뒤에 일어납니"
 "다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "기본 전달 모양새"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Default reply style"
+msgstr "기본 답장 모양새"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "제목 없는 메시지를 보내려 할 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt when emptying the trash"
 msgstr "지운 메시지를 비울 때 확인"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "지운 메시지를 비울 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "완전히 지울 때 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메시지를 완전히 지우려 할 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "메일 주소로 입력하지 않은 수신자에게 보낼 때 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8528,48 +8561,48 @@ msgstr ""
 "메일 주소로 입력하지 않은 수신자에게 메시지를 보낼 경우 반복해서 경고하는 기"
 "능을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했을 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "To나 Cc로 받는 사람이 없는 상태로 메시지를 보내려 할 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML 메시지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10개 이상의 메시지를 열려고 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "사용자가 10개 이상의 메시지를 한번에 열면, 정말로 열 지 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "여러 개 메시지에 표시하려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "여러 개의 메시지에 표시할 때 확인 질문을 할지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when deleting messages in search folder"
 msgstr "검색 폴더에서 메시지를 지울 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -8578,11 +8611,11 @@ msgstr ""
 "검색 결과에서 제거하는 게 아니라, 찾기 폴더에서 메시지를 지울 경우 메시지를 "
 "영구히 삭제한다고 반복해서 경고하는 기능을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "폴더 구조에서 폴더를 끌어놓기로 복사할지 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8593,11 +8626,11 @@ msgstr ""
 "음, 'always' - 물어보지 않고 끌어놓기로 폴더 구조에서 폴더 복사 허용, 'ask' "
 "- (아니면 기타 다른 모든 값) 사용자에게 확인 질문."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "폴더 구조에서 폴더를 끌어놓기로 이동할지 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8608,11 +8641,11 @@ msgstr ""
 "않음, 'always' - 물어보지 않고 끌어놓기로 폴더 구조에서 폴더 옮기기 허용, "
 "'ask' - (아니면 기타 다른 모든 값) 사용자에게 확인 질문."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when replying privately to list messages"
-msgstr "메일링 리스트 메시지에 개인 회신을 할 때 물어봅니다"
+msgstr "메일링 리스트 메시지에 개인 답장을 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -8620,11 +8653,11 @@ msgstr ""
 "메일링 리스트에서 받은 메시지에 개인 답장을 보낼 경우 반복해서 경고하는 기능"
 "을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when mailing list hijacks private replies"
-msgstr "메일링 리스트에서 개인 회신을 가로채려 할 때 물어봅니다"
+msgstr "메일링 리스트에서 개인 답장을 가로채려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -8634,78 +8667,68 @@ msgstr ""
 "서 Reply-To: 헤더가 설정되어 있어서 답장을 리스트로 보내게 되는 경우 반복해"
 "서 경고하는 확인 창을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when replying to many recipients"
-msgstr "많은 수신자에게 회신할 때 물어봅니다"
+msgstr "많은 수신자에게 답장할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
-"많은 사람에게 회신을 보내려 할 때 반복해서 경고하는 확인 창을 끄고 켭니다."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-"사용자가 창에 표시된 메시지를 전달하거나 메시지에 회신한 경우 메시지 창을 닫"
-"을지 여부를 물어봅니다"
+"많은 사람에게 답장을 보내려 할 때 반복해서 경고하는 확인 창을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
-msgstr ""
-"사용 가능한 값은: 'never' - 브라우저 창을 닫지 않음, 'always' - 항상 브라우"
-"저 창을 닫음, 'ask' - (아니면 기타 다른 모든 값) 사용자에게 확인 질문."
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr "메시지에 답장하거나 전달할 때 메시지 보기 창을 닫는 정책."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "끝날 때 지운 메시지 폴더를 비웁니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 지운 메시지 폴더를 비웁니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum days between emptying the trash on exit"
 msgstr "끝날 때 휴지통을 비울 최소 날짜 간격"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "마지막으로 휴지통을 비운 시각"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "마지막으로 휴지통을 비운 시각, 1970년 1월 1일부터(epoch) 지난 날 수."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "오류를 상태 표시줄에 표시할 시간, 초 단위."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Level beyond which the message should be logged."
 msgstr "어떤 메시지를 기록할지 단계."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "세 가지 값이 가능합니다. \"0\"은 오류, \"1\"은 경고, \"2\"는 디버깅 메시지."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
 msgstr "원래의 \"날짜\" 헤더 값을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -8715,11 +8738,11 @@ msgstr ""
 "현지 시각으로 표시합니다.) 거짓이면 \"Date\" 헤더 값을 사용자가 지정한 형식"
 "과 현지 표준 시간대에 맞춰 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of Labels and their associated colors"
 msgstr "레이블 및 레이블 색의 목록"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -8727,45 +8750,45 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 레이블 목록입니다. 이 목록에는 <이름>:<색> "
 "형식의 문자열이 들어 있습니다. 색은 HTML 방식 16진수 인코딩을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Check incoming mail being junk"
 msgstr "정크메일 검사"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Run junk test on incoming mail."
 msgstr "받은 메일에 대해 정크메일 검사를 실행합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "끝날 때 정크메일 폴더를 비웁니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 정크 메일 폴더를 비웁니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the junk on exit"
 msgstr "끝날 때 정크 메일을 비울 최소 날짜 간격"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Junk was run"
 msgstr "마지막으로 정크 메일을 비운 시각"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "마지막으로 정크 메일을 비운 시각, 1970년 1월 1일부터(epoch) 지난 날 수."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "정크 메일 후크에 대한 기본 플러그인"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8775,11 +8798,11 @@ msgstr ""
 "다. 기본 목록 플러그인을 사용하지 않는 경우, 사용 가능한 다른 플러그인을 대"
 "신 사용하지 않습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "주소록에서 보낸 사람 전자메일을 찾아볼 지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8790,13 +8813,13 @@ msgstr ""
 "팸 메일이 아니라고 판단합니다. 자동 완성 용도로도 주소록을 찾아 봅니다. LDAP"
 "와 같은 원격 주소록을 자동 완성에 사용할 경우 느릴 수도 있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "정크메일 필터링할 때 로컬 주소록에서만 주소를 찾아 볼 지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -8806,11 +8829,11 @@ msgstr ""
 "알려진 사람이 보낸 메일을 제외할 때, 로컬 주소록에서만 주소를 찾아 볼지 여부"
 "를 결정합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "정크 메일 검사에 사용자 지정 헤더를 사용할지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -8819,11 +8842,11 @@ msgstr ""
 "정크 메일 검사에 사용자 지정 헤더를 사용할지 결정합니다. 이 옵션을 사용하고 "
 "헤더를 지정하면 정크 메일 검사 기능의 속도를 높일 수 있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk."
 msgstr "정크 메일을 검사할 때 사용할 사용자 지정 헤더."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8831,31 +8854,31 @@ msgstr ""
 "정크 메일을 검사할 때 사용할 사용자 지정 헤더. 목록의 각 항목은 \"헤더이름=값"
 "\" 형식의 문자열입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "저장 디렉터리"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "메일 관련 파일을 저장할 디렉터리."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "메시지 작성 읽어들이기/첨부 디렉터리"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "메시지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉터리."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "시작할 때 새 메시지를 검사"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -8863,12 +8886,12 @@ msgstr ""
 "에볼루션을 시작할 때 새 메시지를 확인할지 여부. 이 때 보낼 편지함의 메시지도 "
 "보냅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Check for new messages in all active accounts"
 msgstr "모든 계정에 대해 새 메시지를 검사"
 
 # "Check for new messages every X messages" -> "새 메일 확인(_N), 매"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -8878,11 +8901,11 @@ msgstr ""
 "용 중인 계정의 새 메시지를 확인할지 여부. 이 옵션은 \"send_recv_on_start\" 옵"
 "션과 같이만 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "서버 동기화 주기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8890,6 +8913,58 @@ msgstr ""
 "얼마나 자주 로컬의 변경 사항을 원격 메일 서버와 동기화할지 정합니다. 이 간격"
 "은 최소한 30초 이상 되어야 합니다."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "(Deprecated) Default forward style"
+msgstr "(없어질 예정) 기본 전달 모양새"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"forward-style-name\"을 사용하십시오."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "(Deprecated) Default reply style"
+msgstr "(없어질 예정) 기본 답장 모양새"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"reply-style-name\"을 사용하십시오."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "(없어질 예정) 사용자 지정 헤더와 그 헤더를 사용할지 여부의 목록."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"show-headers\"를 사용하십시오."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "(없어질 예정) HTTP를 통해 HTML 메시지의 그림을 읽어들입니다"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"image-loading-policy\"를 사용하십시오."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr "(없어질 예정) 사용자가 창에 표시된 메시지를 전달하거나 메시지에 답장하는 경우 메시지 창을 닫을지 여부를 물어봅니다"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대신 \"browser-close-on-reply-policy\"를 사용하십시오."
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
@@ -8990,7 +9065,6 @@ msgid "The default command that must be used as the editor."
 msgstr "편집기로 사용할 기본 명령어."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:123
 msgid "Automatically launch when a new mail is edited"
 msgstr "새 메일을 편집할 때 자동으로 실행"
 
@@ -9169,7 +9243,7 @@ msgstr "최초 파일 선택 폴더"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 대화 상자의 최초 폴더."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "연결 중지 상태에서 시작"
 
@@ -9259,19 +9333,7 @@ msgstr "로컬 스팸 테스트만 사용합니다."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다(DNS는 사용하지 않습니다)."
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Socket path for SpamAssassin"
-msgstr "스팸어새신 소켓 경로"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-msgid "Use SpamAssassin daemon and client"
-msgstr "스팸어새신 데몬 및 클라이언트 사용"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use spamc and spamd programs, if available."
-msgstr "spamc 및 spamd 프로그램 사용, 있으면."
-
-#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../em-format/e-mail-formatter-attachment.c:397
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
@@ -9279,144 +9341,100 @@ msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "첨부"
 
-#: ../em-format/e-mail-formatter-attachment.c:371
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "첨부로 표시"
 
-#: ../em-format/e-mail-formatter.c:1389 ../mail/e-mail-tag-editor.c:326
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "보낸 사람"
 
-#: ../em-format/e-mail-formatter.c:1390 ../modules/mail/em-mailer-prefs.c:62
-msgid "Reply-To"
-msgstr "회신 주소"
-
-#: ../em-format/e-mail-formatter.c:1392
-#: ../em-format/e-mail-formatter-utils.c:196
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "Cc"
-msgstr "참조"
-
-#: ../em-format/e-mail-formatter.c:1393
-#: ../em-format/e-mail-formatter-utils.c:198
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../modules/mail/em-mailer-prefs.c:65
-msgid "Bcc"
-msgstr "숨은 참조"
-
-#: ../em-format/e-mail-formatter.c:1394
-#: ../em-format/e-mail-formatter-quote-headers.c:150
-#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
-#: ../smime/lib/e-asn1-object.c:712
-msgid "Subject"
-msgstr "제목"
-
-#: ../em-format/e-mail-formatter.c:1395 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:67
-msgid "Date"
-msgstr "날짜"
-
-#: ../em-format/e-mail-formatter.c:1396 ../modules/mail/em-mailer-prefs.c:68
-msgid "Newsgroups"
-msgstr "뉴스그룹"
-
-#: ../em-format/e-mail-formatter.c:1397 ../modules/mail/em-mailer-prefs.c:69
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "얼굴"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:100
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "보낸 사람: %s"
-
-#: ../em-format/e-mail-formatter-headers.c:121
-#: ../em-format/e-mail-formatter-headers.c:126
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(제목 없음)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:333
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "이 메시지는 %s이(가) %s 자격으로 보냈습니다."
 
-#: ../em-format/e-mail-formatter-image.c:143
+#: ../em-format/e-mail-formatter-image.c:152
 msgid "Regular Image"
 msgstr "일반 그림"
 
 # tooltip
-#: ../em-format/e-mail-formatter-image.c:144
+#: ../em-format/e-mail-formatter-image.c:153
 msgid "Display part as an image"
 msgstr "이 부분을 그림으로 표시합니다"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:242
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
 msgid "RFC822 message"
 msgstr "RFC822 메시지"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
 msgid "Format part as an RFC822 message"
 msgstr "이 부분을 RFC822 메시지로 표시합니다"
 
-#: ../em-format/e-mail-formatter-print.c:56
-#: ../e-util/gal-define-views-dialog.c:361
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
 #: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/cal-config-google/e-google-chooser.c:237
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "이름"
 
-#: ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "크기"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:120
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
-msgid "Security"
-msgstr "보안"
-
-#: ../em-format/e-mail-formatter-print-headers.c:138
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG signed"
 msgstr "GPG 서명됨"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "GPG encrpyted"
 msgstr "GPG 암호화됨"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME signed"
 msgstr "S/MIME 서명됨"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:162
 msgid "S/MIME encrpyted"
 msgstr "S/MIME 암호화됨"
 
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "보안"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "제목"
+
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:161
-#: ../em-format/e-mail-formatter-utils.c:346
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "메일 프로그램"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
 msgid "Richtext"
 msgstr "리치텍스트"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
 msgid "Display part as enriched text"
 msgstr "이 부분을 리치텍스트로 표시"
 
@@ -9430,13 +9448,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "이 부분을 HTML로 표시합니다"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:111
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
 msgid "Plain Text"
 msgstr "일반 텍스트"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:112
-#: ../em-format/e-mail-formatter-text-plain.c:187
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
 msgid "Format part as plain text"
 msgstr "일반 텍스트로 표시"
 
@@ -9549,25 +9567,37 @@ msgstr ""
 "메시지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메시지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../em-format/e-mail-formatter-secure-button.c:182
 #: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:195
+#: ../em-format/e-mail-formatter-secure-button.c:197
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
 # 소스 코드를 그대로 표시한다는 뜻
-#: ../em-format/e-mail-formatter-source.c:126
+#: ../em-format/e-mail-formatter-source.c:130
 msgid "Source"
 msgstr "원본"
 
 # 소스 코드를 그대로 표시한다는 뜻
-#: ../em-format/e-mail-formatter-source.c:127
+#: ../em-format/e-mail-formatter-source.c:131
 msgid "Display source of a MIME part"
 msgstr "MIME 부분의 원본을 표시"
 
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "참조"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "숨은 참조"
+
 #: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9593,27 +9623,27 @@ msgstr "서명을 확인하는 중 오류가 발생했습니다: %s"
 msgid "Malformed external-body part"
 msgstr "외부 본문 부분의 형식이 잘못되었습니다"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 사이트(%s)를 가리킵니다"
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "로컬 파일(%s)을 가리킵니다"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "원격 데이터(%s)을 가리킵니다"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
@@ -9636,6 +9666,25 @@ msgstr "PGP/MIME 메시지를 분석할 수 없습니다: %s"
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "회신 주소"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "날짜"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "뉴스그룹"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "얼굴"
+
 #: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
@@ -9729,6 +9778,10 @@ msgstr "기한(_U):"
 msgid "Delivery Options"
 msgstr "배달 옵션"
 
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "우선순위(_P):"
+
 #: ../e-util/e-send-options.ui.h:27
 msgid "_Classification:"
 msgstr "분류(_C):"
@@ -9785,89 +9838,65 @@ msgstr "반송 메일 알림"
 msgid "Sta_tus Tracking"
 msgstr "상태 추적(_T)"
 
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
-msgid "Show Fields"
-msgstr "필드 표시"
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "정렬(_S)..."
 
 #: ../e-util/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "사용 가능한 필드(_V):"
+msgid "_Group By..."
+msgstr "모으기(_G)..."
 
 #: ../e-util/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "다음 필드를 순서대로 표시(_S):"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "위로 이동(_U)"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "아래로 이동(_D)"
+msgid "_Fields Shown..."
+msgstr "표시할 필드(_F)..."
 
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:969
-msgid "_Remove"
-msgstr "제거(_R)"
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "모두 지우기(_A)"
 
-#: ../e-util/e-table-config.ui.h:9
+#: ../e-util/e-table-config.ui.h:7
 msgid "_Show field in View"
 msgstr "뷰에서 필드 표시(_S)"
 
-#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "증가"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "감소"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:10
 msgid "Group Items By"
 msgstr "항목 모음 기준"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:11
 msgid "Show _field in View"
 msgstr "뷰에서 필드 표시(_F)"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:12
 msgid "Then By"
 msgstr "다음 기준"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "뷰에서 필드 표시(_N)"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "뷰에서 필드 표시(_V)"
 
-#: ../e-util/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "모두 지우기(_A)"
-
-#: ../e-util/e-table-config.ui.h:18
+#: ../e-util/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "정렬"
 
-#: ../e-util/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "항목 정렬 기준"
-
-#: ../e-util/e-table-config.ui.h:20
+#: ../e-util/e-table-config.ui.h:16
 msgid "Clear All"
 msgstr "모두 지우기"
 
-#: ../e-util/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "정렬(_S)..."
-
-#: ../e-util/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "모으기(_G)..."
-
-#: ../e-util/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "표시할 필드(_F)..."
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "항목 정렬 기준"
 
 #: ../e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
@@ -9896,7 +9925,7 @@ msgid "Timezone drop-down combination box"
 msgstr "표준 시간대 드롭다운 콤보 상자"
 
 #: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:293
+#: ../mail/em-utils.c:240
 msgid "Incoming"
 msgstr "받는 메일"
 
@@ -9973,16 +10002,6 @@ msgstr ""
 "필터링하는 시각까지 얼마나 지났나를 기준으로\n"
 "메시지 시각을 비교합니다."
 
-#: ../e-util/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "\"%s\"에 대한 뷰 정의"
-
-#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "%s에 대한 뷰 정의"
-
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "새 뷰 만들기(_C)"
@@ -9998,61 +10017,50 @@ msgstr "이름(_N):"
 msgid "_Replace existing view"
 msgstr "현재 뷰 바꾸기(_R)"
 
-#: ../e-util/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "새 뷰의 이름:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "뷰 종류:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "뷰 종류"
-
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Cancel"
 msgstr "취소"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:247
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (취소함)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:250
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (완료)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:253
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (대기 중)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:257
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (취소하는 중)"
 
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:264
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
-#: ../e-util/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "이 메시지를 닫습니다"
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:121
+msgid "Close this message (Escape)"
+msgstr "이 메시지를 닫습니다(Esc)"
 
 #: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
 msgid "Icon View"
@@ -10062,19 +10070,19 @@ msgstr "아이콘 보기"
 msgid "List View"
 msgstr "목록 보기"
 
-#: ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-dialog.c:318
 msgid "Attachment Properties"
 msgstr "첨부 속성"
 
-#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "파일 이름(_I):"
 
-#: ../e-util/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:375
 msgid "MIME Type:"
 msgstr "MIME 종류:"
 
-#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 우선(_S)"
 
@@ -10086,19 +10094,6 @@ msgstr "배경으로 설정할 수 없습니다"
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
-#: ../e-util/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "첨부를 보낼 수 없습니다."
-
-#: ../e-util/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "보내기(_S)..."
-
-#: ../e-util/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "선택한 첨부를 다른 곳으로 보냅니다"
-
 #: ../e-util/e-attachment-icon-view.c:166
 #: ../e-util/e-attachment-tree-view.c:549
 msgid "Loading"
@@ -10117,22 +10112,22 @@ msgstr "첨부 모음 숨기기(_B)"
 msgid "Show Attachment _Bar"
 msgstr "첨부 모음 보이기(_B)"
 
-#: ../e-util/e-attachment-store.c:429
+#: ../e-util/e-attachment-store.c:463
 msgid "Add Attachment"
 msgstr "첨부 추가"
 
-#: ../e-util/e-attachment-store.c:432
+#: ../e-util/e-attachment-store.c:466
 msgid "A_ttach"
 msgstr "첨부(_T)"
 
-#: ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:537
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "첨부 저장"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
-#: ../e-util/e-attachment.c:2477
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2048
+#: ../e-util/e-attachment.c:2708
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -10164,12 +10159,12 @@ msgstr "내부에서 보기(_V)"
 msgid "Vie_w All Inline"
 msgstr "모두 내부에서 보기(_W)"
 
-#: ../e-util/e-attachment-view.c:777
+#: ../e-util/e-attachment-view.c:786
 #, c-format
 msgid "Open With \"%s\""
 msgstr "\"%s\"에서 열기"
 
-#: ../e-util/e-attachment-view.c:780
+#: ../e-util/e-attachment-view.c:789
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "이 첨부를 \"%s\"에서 열기"
@@ -10178,48 +10173,48 @@ msgstr "이 첨부를 \"%s\"에서 열기"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:978
+#: ../e-util/e-attachment.c:1103
 msgid "Attached message"
 msgstr "첨부한 메시지"
 
-#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
+#: ../e-util/e-attachment.c:2129 ../e-util/e-attachment.c:3014
 msgid "A load operation is already in progress"
 msgstr "읽어들이기 동작이 이미 진행 중입니다"
 
-#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
+#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3022
 msgid "A save operation is already in progress"
 msgstr "저장 동작이 이미 진행 중입니다"
 
-#: ../e-util/e-attachment.c:2033
+#: ../e-util/e-attachment.c:2254
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s'을(를) 읽어들일 수 없습니다"
 
-#: ../e-util/e-attachment.c:2036
+#: ../e-util/e-attachment.c:2257
 #, c-format
 msgid "Could not load the attachment"
 msgstr "첨부를 읽어들일 수 없습니다"
 
-#: ../e-util/e-attachment.c:2334
+#: ../e-util/e-attachment.c:2561
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s'을(를) 열 수 없습니다"
 
-#: ../e-util/e-attachment.c:2337
+#: ../e-util/e-attachment.c:2564
 #, c-format
 msgid "Could not open the attachment"
 msgstr "첨부를 열 수 없습니다."
 
-#: ../e-util/e-attachment.c:2795
+#: ../e-util/e-attachment.c:3031
 msgid "Attachment contents not loaded"
 msgstr "첨부 내용을 읽어들이지 않았습니다"
 
-#: ../e-util/e-attachment.c:2871
+#: ../e-util/e-attachment.c:3107
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s'을(를) 저장할 수 없습니다"
 
-#: ../e-util/e-attachment.c:2874
+#: ../e-util/e-attachment.c:3110
 #, c-format
 msgid "Could not save the attachment"
 msgstr "첨부를 저장할 수 없습니다"
@@ -10270,19 +10265,19 @@ msgid "Copy memo list contents locally for offline operation"
 msgstr "연결 중지 상태 작업을 위해 메모 목록 내용을 로컬에 복사"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1326
+#: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y년"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1363
+#: ../e-util/e-calendar-item.c:1366
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y년 %B"
@@ -10361,8 +10356,8 @@ msgstr "현재"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1924
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1900
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today"
 msgstr "오늘"
 
@@ -10383,13 +10378,13 @@ msgid "The time must be in the format: %s"
 msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 
 # ???
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
 msgid "?"
 msgstr "?"
 
 #: ../e-util/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "퍼센트 값은 0과 100을 포함하여 그 사이어야 합니다."
+msgstr "퍼센트 값은 0에서 100까지 값입니다"
 
 #: ../e-util/e-charset-combo-box.c:100
 msgid "Character Encoding"
@@ -10480,63 +10475,63 @@ msgstr "우크라이나어"
 msgid "Visual"
 msgstr "비주얼"
 
-#: ../e-util/e-client-cache.c:1061
+#: ../e-util/e-client-cache.c:1162
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "확장자 이름 '%s'에서 클라이언트 오브젝트를 만들 수 없습니다"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "날짜 및 시간"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "날짜 입력하는 텍스트 엔트리"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "달력을 보려면 단추를 누르십시오"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "시간을 선택하는 드롭다운 콤보 상자"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "시간"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "현재(_W)"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "오늘(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "없음(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
 msgctxt "date"
 msgid "None"
 msgstr "없음"
 
-#: ../e-util/e-dateedit.c:1951
+#: ../e-util/e-dateedit.c:1953
 msgid "Invalid Date Value"
 msgstr "날짜 값이 잘못되었습니다"
 
-#: ../e-util/e-dateedit.c:1996
+#: ../e-util/e-dateedit.c:1998
 msgid "Invalid Time Value"
 msgstr "시간 값이 잘못되었습니다"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:256
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "내일"
 
@@ -10609,20 +10604,20 @@ msgstr "로캘 기본값 사용"
 msgid "Format:"
 msgstr "형식:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(알 수 없는 파일 이름)"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "\"%s\" 쓰는 중"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" 파일을 %s 위치에 쓰는 중"
@@ -10786,7 +10781,7 @@ msgstr "글타래 포함(_N):"
 msgid "A_dd Condition"
 msgstr "조건 추가(_D)"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "보내는 메일"
 
@@ -10877,7 +10872,8 @@ msgid ""
 "external files into Evolution."
 msgstr ""
 "에볼루션 가져오기 도우미에게 오신 것을 환영합니다.\n"
-"이 도우미의 안내에 따라 외부의 파일을 에볼루션으로 가져오는 단계를 따르십시오."
+"이 도우미의 안내에 따라 외부의 파일을 에볼루션으로 가져오는 단계를 따르십시"
+"오."
 
 #: ../e-util/e-import-assistant.c:1327
 msgid "Importer Type"
@@ -10899,23 +10895,23 @@ msgstr "에볼루션으로 파일을 가져오려면 \"적용\"을 누르십시
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
-#: ../e-util/e-mail-signature-editor.c:305
+#: ../e-util/e-mail-signature-editor.c:310
 msgid "Close"
 msgstr "닫기"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:315
 msgid "_Save and Close"
 msgstr "저장 후 닫기(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:524
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "서명 편집"
 
-#: ../e-util/e-mail-signature-editor.c:544
+#: ../e-util/e-mail-signature-editor.c:549
 msgid "_Signature Name:"
 msgstr "서명 이름(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:590
+#: ../e-util/e-mail-signature-editor.c:595
 msgid "Unnamed"
 msgstr "이름없음"
 
@@ -10960,11 +10956,11 @@ msgstr ""
 "마우스를 이용해 표준 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 드롭"
 "다운 콤보 상자를 이용해 표준 시간대를 선택해야 합니다."
 
-#: ../e-util/e-misc-utils.c:244
+#: ../e-util/e-misc-utils.c:242
 msgid "Could not open the link."
 msgstr "링크를 열 수 없습니다."
 
-#: ../e-util/e-misc-utils.c:291
+#: ../e-util/e-misc-utils.c:289
 msgid "Could not display help for Evolution."
 msgstr "에볼루션 도움말을 표시할 수 없습니다."
 
@@ -10985,11 +10981,11 @@ msgid "_Search:"
 msgstr "검색(_S):"
 
 #: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1243
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
-#: ../modules/calendar/e-cal-shell-view-actions.c:1757
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../e-util/e-name-selector-dialog.c:1276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Any Category"
 msgstr "모든 분류"
 
@@ -11007,35 +11003,39 @@ msgid "Address Book"
 msgstr "주소록"
 
 #: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:305
-#: ../modules/addressbook/e-book-shell-view.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
 msgid "Contacts"
 msgstr "연락처"
 
-#: ../e-util/e-name-selector-dialog.c:575
+#: ../e-util/e-name-selector-dialog.c:578
 msgid "Select Contacts from Address Book"
 msgstr "주소록에서 연락처 선택"
 
+#: ../e-util/e-name-selector-dialog.c:1001
+msgid "_Remove"
+msgstr "제거(_R)"
+
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3023
+#: ../e-util/e-name-selector-entry.c:3028
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "내부에 %s 펼치기(_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3039
+#: ../e-util/e-name-selector-entry.c:3044
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s 복사(_Y)"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3050
+#: ../e-util/e-name-selector-entry.c:3055
 #, c-format
 msgid "C_ut %s"
 msgstr "%s 잘라내기(_U)"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3068
+#: ../e-util/e-name-selector-entry.c:3073
 #, c-format
 msgid "_Edit %s"
 msgstr "%s 편집(_E)"
@@ -11102,62 +11102,62 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "인쇄 시스템에서 추가 오류 내용을 자세히 보고하지 않았습니다."
 
-#: ../e-util/e-rule-editor.c:288
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "규칙 추가"
 
-#: ../e-util/e-rule-editor.c:395
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "규칙 편집"
 
-#: ../e-util/e-search-bar.c:79
+#: ../e-util/e-search-bar.c:81
 #, c-format
 msgid "Matches: %u"
 msgstr "일치: %u"
 
-#: ../e-util/e-search-bar.c:527
+#: ../e-util/e-search-bar.c:565
 msgid "Close the find bar"
 msgstr "이 찾기 모음을 닫습니다"
 
-#: ../e-util/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:573
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
-#: ../e-util/e-search-bar.c:547
+#: ../e-util/e-search-bar.c:585
 msgid "Clear the search"
 msgstr "검색 결과 지우기"
 
-#: ../e-util/e-search-bar.c:571
+#: ../e-util/e-search-bar.c:609
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr "이전에 있는 해당 문구를 찾습니다"
 
-#: ../e-util/e-search-bar.c:590
+#: ../e-util/e-search-bar.c:624
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../e-util/e-search-bar.c:596
+#: ../e-util/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "다음에 있는 해당 문구를 찾습니다"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "대소문자 구별(_C)"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "페이지 맨 아래에 도착했습니다. 맨 위부터 계속합니다"
 
-#: ../e-util/e-search-bar.c:659
+#: ../e-util/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "페이지 맨 위에 도착했습니다. 맨 아래부터 계속합니다"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1075
 msgid "Mail"
 msgstr "메일"
 
@@ -11165,29 +11165,29 @@ msgstr "메일"
 msgid "When de_leted:"
 msgstr "지울 때(_L):"
 
-#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
 msgid "Type:"
 msgstr "형태:"
 
-#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
 msgid "Name:"
 msgstr "이름:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1293
+#: ../e-util/e-source-config.c:1302
 msgid "Refresh every"
 msgstr "폴더 새로 고침 주기:"
 
-#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
 msgid "Use a secure connection"
 msgstr "보안 연결 사용"
 
-#: ../e-util/e-source-config.c:1416
+#: ../e-util/e-source-config.c:1428
 msgid "Unset _trust for SSL certificate"
 msgstr "SSL 인증서 신뢰 해제(_T)"
 
-#: ../e-util/e-source-config.c:1450
+#: ../e-util/e-source-config.c:1464
 msgid "User"
 msgstr "사용자"
 
@@ -11200,26 +11200,26 @@ msgid "Select destination"
 msgstr "대상 선택"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:352
+#: ../e-util/e-spell-entry.c:384
 msgid "(no suggestions)"
 msgstr "(제안 없음)"
 
-#: ../e-util/e-spell-entry.c:376
+#: ../e-util/e-spell-entry.c:408
 msgid "More..."
 msgstr "더 보기..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:445
+#: ../e-util/e-spell-entry.c:479
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "사전에 \"%s\" 추가"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:530
 msgid "Ignore All"
 msgstr "모두 무시"
 
-#: ../e-util/e-spell-entry.c:514
+#: ../e-util/e-spell-entry.c:558
 msgid "Spelling Suggestions"
 msgstr "맞춤법 제안"
 
@@ -11287,7 +11287,8 @@ msgstr "에볼루션을 다시 시작할 때 까지는 일부 약속을 사용
 
 #: ../e-util/e-system.error.xml.h:15
 msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "&quot;{0}&quot; 서비스 중인 메모 목록 백엔드가 예상치 못하게 끝났습니다."
+msgstr ""
+"&quot;{0}&quot; 서비스 중인 메모 목록 백엔드가 예상치 못하게 끝났습니다."
 
 #: ../e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
@@ -11295,7 +11296,8 @@ msgstr "에볼루션을 다시 시작할 때 까지는 일부 메모를 사용
 
 #: ../e-util/e-system.error.xml.h:17
 msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "&quot;{0}&quot; 서비스 중인 작업 목록 백엔드가 예상치 못하게 끝났습니다."
+msgstr ""
+"&quot;{0}&quot; 서비스 중인 작업 목록 백엔드가 예상치 못하게 끝났습니다."
 
 #: ../e-util/e-system.error.xml.h:18
 msgid "Some of your tasks may not be available until Evolution is restarted."
@@ -11318,37 +11320,66 @@ msgstr "&quot;{0}&quot; 서비스 중인 메모 목록 백엔드에서 오류가
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "&quot;{0}&quot; 서비스 중인 작업 목록 백엔드에서 오류가 발생했습니다."
 
-#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/e-table-click-to-add.c:680
 #: ../e-util/gal-a11y-e-table-click-to-add.c:62
 #: ../e-util/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "추가하려면 누르십시오"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+# tooltip
+#: ../e-util/e-table-column-selector.c:266
+msgid "Move selected column names to top"
+msgstr "선택한 열 이름을 맨 위로 옮깁니다"
+
+# tooltip
+#: ../e-util/e-table-column-selector.c:271
+msgid "Move selected column names up one row"
+msgstr "선택한 열 이름을 한 줄 위로 옮깁니다"
+
+# tooltip
+#: ../e-util/e-table-column-selector.c:276
+msgid "Move selected column names down one row"
+msgstr "선택한 열 이름을 한 줄 아래로 옮깁니다"
+
+# tooltip
+#: ../e-util/e-table-column-selector.c:281
+msgid "Move selected column names to bottom"
+msgstr "선택한 열 이름을 맨 아래로 옮깁니다"
+
+# tooltip
+#: ../e-util/e-table-column-selector.c:286
+msgid "Select all column names"
+msgstr "모든 열 이름을 선택합니다"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(증가)"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(감소)"
 
-#: ../e-util/e-table-config.c:404
+#: ../e-util/e-table-config.c:396
 msgid "Not sorted"
 msgstr "정렬 안 함"
 
-#: ../e-util/e-table-config.c:445
+#: ../e-util/e-table-config.c:441
 msgid "No grouping"
 msgstr "묶지 않음"
 
-#: ../e-util/e-table-config.c:690
-msgid "Available Fields"
-msgstr "사용 가능한 필드"
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "필드 표시"
+
+#: ../e-util/e-table-config.c:562
+msgid "Choose the order of information to appear in the message list."
+msgstr "메시지 목록에 나타날 정보의 순서를 선택하십시오."
 
 #: ../e-util/e-table-field-chooser-dialog.c:227
 msgid "Add a Column"
 msgstr "열 추가"
 
-#: ../e-util/e-table-field-chooser.c:164
+#: ../e-util/e-table-field-chooser.c:167
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11356,72 +11387,72 @@ msgstr ""
 "표에 열을 추가하려면, 열을 표시할\n"
 "위치에 열을 끌어 놓으십시오."
 
-#: ../e-util/e-table-group-container.c:363
+#: ../e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d개 항목)"
 
-#: ../e-util/e-table-group-container.c:377
+#: ../e-util/e-table-group-container.c:383
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d개 항목)"
 
-#: ../e-util/e-table-header-item.c:1579
+#: ../e-util/e-table-header-item.c:1576
 msgid "Customize Current View"
 msgstr "현재 뷰 사용자 설정하기"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1599
 msgid "Sort _Ascending"
 msgstr "오름차순 정렬(_A)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1602
 msgid "Sort _Descending"
 msgstr "내림차순 정렬(_D)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1605
 msgid "_Unsort"
 msgstr "정렬 안함(_U)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1608
 msgid "Group By This _Field"
 msgstr "이 범위로 묶음(_F)"
 
-#: ../e-util/e-table-header-item.c:1614
+#: ../e-util/e-table-header-item.c:1611
 msgid "Group By _Box"
 msgstr "상자로 묶음(_B)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1615
 msgid "Remove This _Column"
 msgstr "열 제거(_C)"
 
-#: ../e-util/e-table-header-item.c:1621
+#: ../e-util/e-table-header-item.c:1618
 msgid "Add a C_olumn..."
 msgstr "열 추가(_O)..."
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1622
 msgid "A_lignment"
 msgstr "정렬(_L)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1625
 msgid "B_est Fit"
 msgstr "자동 맞춤(_E)"
 
-#: ../e-util/e-table-header-item.c:1631
+#: ../e-util/e-table-header-item.c:1628
 msgid "Format Column_s..."
 msgstr "열 형식(_S)..."
 
-#: ../e-util/e-table-header-item.c:1635
+#: ../e-util/e-table-header-item.c:1632
 msgid "Custo_mize Current View..."
 msgstr "현재 보기 사용자 설정(_M)..."
 
-#: ../e-util/e-table-header-item.c:1706
+#: ../e-util/e-table-header-item.c:1703
 msgid "_Sort By"
 msgstr "정렬 기준(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1724
+#: ../e-util/e-table-header-item.c:1726
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
@@ -11440,59 +11471,86 @@ msgstr "입력기"
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:80
-msgid "Click here to go to URL"
-msgstr "URL로 가려면 여기를 누르십시오"
+#: ../e-util/e-url-entry.c:109
+msgid "Click here to open the URL"
+msgstr "URL을 열려면 여기를 누르십시오"
+
+#: ../e-util/e-url-entry.c:111
+msgid "Enter a URL here"
+msgstr "여기 URL 입력"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "링크를 클립보드로 복사합니다"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "웹 브라우저에서 링크 열기"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "전자메일 주소 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "그림 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "그림을 클립보드로 복사합니다"
 
 #: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
 msgid "Select all text and images"
 msgstr "모든 텍스트와 그림을 선택합니다"
 
 #: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
-#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
+#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
 #, c-format
 msgid "Click to call %s"
 msgstr "%s에게 호출하려면 누르십시오"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
 msgid "Click to hide/unhide addresses"
 msgstr "주소를 감추려면/보이려면 누르십시오"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URL을 열려면 누르십시오"
 
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "그림 저장(_I)..."
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "그림을 파일에 저장합니다"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../e-util/e-web-view.c:2834
+msgid "Copying image to clipboard"
+msgstr "그림을 클립보드로 복사하는 중"
+
+#: ../e-util/e-web-view.c:3022
+msgid "Save Image"
+msgstr "그림 저장"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../e-util/e-web-view.c:3058
+#, c-format
+msgid "Saving image to '%s'"
+msgstr "그림을 '%s'에 저장하는 중"
+
 #: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
 msgid "%d %B %Y"
 msgstr "%Y년 %B %d일"
@@ -11600,23 +11658,10 @@ msgstr "누르기"
 msgid "sort"
 msgstr "정렬"
 
-#: ../e-util/gal-define-views-dialog.c:385
-#: ../e-util/gal-define-views-dialog.c:388
-msgid "Define Views"
-msgstr "뷰 정의"
-
-#: ../e-util/gal-view-factory-etable.c:114
-msgid "Table"
-msgstr "도표"
-
 #: ../e-util/gal-view-instance-save-as-dialog.c:296
 msgid "Save Current View"
 msgstr "현재 뷰 저장"
 
-#: ../e-util/gal-view-new-dialog.c:173
-msgid "Define New View"
-msgstr "새 뷰 정의"
-
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "바뀐 내용을 저장하시겠습니까?"
@@ -11638,10 +11683,18 @@ msgid "Please provide an unique name to identify this signature."
 msgstr "이 서명을 구분할 수 있는 고유한 이름을 입력하십시오."
 
 #: ../e-util/widgets.error.xml.h:6
+msgid "Unable to copy image to clipboard."
+msgstr "그림을 클립보드에 복사할 수 없습니다."
+
+#: ../e-util/widgets.error.xml.h:7
+msgid "Unable to save image."
+msgstr "그림을 저장할 수 없습니다."
+
+#: ../e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "서명을 읽어들일 수 없습니다."
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "서명을 저장할 수 없습니다."
 
@@ -11664,73 +11717,66 @@ msgstr "인증 결과 코드가 잘못되었습니다(%d)"
 msgid "Saving message to folder '%s'"
 msgstr "메시지를 '%s' 폴더에 저장하는 중"
 
-#: ../libemail-engine/e-mail-folder-utils.c:573
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "전달한 메시지"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-folder-utils.c:683
-#: ../libemail-engine/e-mail-folder-utils.c:934
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메시지 %d개를 가져오는 중"
 
 # tooltip
-#: ../libemail-engine/e-mail-folder-utils.c:777
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "중복된 메시지를 검사하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-folder-utils.c:1185
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "'%s' 폴더를 제거하는 중"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1322
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "\"%s\" 파일을 제거했습니다."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1326
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "파일을 제거했습니다."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1385
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "첨부를 제거."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-folder-utils.c:1549
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "메시지 %d개를 저장하는 중"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1905 ../mail/em-folder-utils.c:610
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:638
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "잘못된 폴더 URI '%s'"
 
 #: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "UID '%s'에 메일 서비스가 없습니다"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID '%s'은(는) 메일 전송 수단이 아닙니다"
+msgid "No mail transport service available"
+msgstr "메일 전송 서비스가 없습니다."
 
-#: ../libemail-engine/e-mail-session-utils.c:647
-#: ../libemail-engine/mail-ops.c:765
+#: ../libemail-engine/e-mail-session-utils.c:640
+#: ../libemail-engine/mail-ops.c:730
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "나가는 필터를 적용하는데 실패했습니다: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:676
-#: ../libemail-engine/e-mail-session-utils.c:710
-#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
+#: ../libemail-engine/e-mail-session-utils.c:689
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11739,99 +11785,99 @@ msgstr ""
 "%s에 추가하는데 실패했습니다: %s\n"
 "대신에 로컬의 '보낸 편지함'에 추가합니다."
 
-#: ../libemail-engine/e-mail-session-utils.c:730
-#: ../libemail-engine/mail-ops.c:839
+#: ../libemail-engine/e-mail-session-utils.c:715
+#: ../libemail-engine/mail-ops.c:798
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "로컬의 '보낸 편지함' 폴더에 추가하는데 실패했습니다: %s"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-session-utils.c:974
-#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
+#: ../libemail-engine/e-mail-session-utils.c:916
+#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
 msgid "Sending message"
 msgstr "메시지 보내는 중입니다"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
-#: ../mail/em-folder-tree-model.c:764
-#: ../modules/mail/e-mail-shell-view-private.c:1094
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 msgid "Inbox"
 msgstr "받은 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
-#: ../modules/mail/e-mail-shell-view-private.c:1092
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Drafts"
 msgstr "임시 보관함"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Outbox"
 msgstr "보낼 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1098
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 msgid "Sent"
 msgstr "보낸 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
-#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
-#: ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "서식"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1347
 #, c-format
 msgid "User cancelled operation"
 msgstr "사용자가 취소한 동작"
 
-#: ../libemail-engine/e-mail-session.c:1615
+#: ../libemail-engine/e-mail-session.c:1542
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 인증 실패"
 
-#: ../libemail-engine/e-mail-session.c:1660
+#: ../libemail-engine/e-mail-session.c:1592
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "UID '%s'에 대해 데이터 소스가 없습니다"
 
-#: ../libemail-engine/e-mail-session.c:1711
+#: ../libemail-engine/e-mail-session.c:1655
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "대상 주소를 입력하지 않았으므로 메시지 전달을 취소합니다."
 
-#: ../libemail-engine/e-mail-session.c:1724
+#: ../libemail-engine/e-mail-session.c:1668
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "사용할 계정이 없으므로 메시지 전달을 취소합니다."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-store-utils.c:171
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s'에서 연결 끊는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:279
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s'에 다시 연결하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:370
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' 연결 중지 상태 계정을 준비 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:1241
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중"
@@ -11849,7 +11895,9 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"선택한 메시지의 필터링에 실패했습니다. 가능한 한 가지 이유는 필터에서 설정한 폴더 위치가 잘못된 경우입니다. 편집->메시지 필터 메뉴에서 필터를 확인하십시오.\n"
+"선택한 메시지의 필터링에 실패했습니다. 가능한 한 가지 이유는 필터에서 설정한 "
+"폴더 위치가 잘못된 경우입니다. 편집->메시지 필터 메뉴에서 필터를 확인하십시"
+"오.\n"
 "원래 오류는: %s"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
@@ -11858,7 +11906,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "'%s'에서 메일 가져오는 중"
 
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/mail-ops.c:724
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -11866,61 +11914,62 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"보내는 필터 적용에 실패했습니다. 가능한 한 가지 이유는 필터에서 설정한 폴더 위치가 잘못된 경우입니다. 편집->메시지 필터 메뉴에서 필터를 확인하십시오.\n"
+"보내는 필터 적용에 실패했습니다. 가능한 한 가지 이유는 필터에서 설정한 폴더 "
+"위치가 잘못된 경우입니다. 편집->메시지 필터 메뉴에서 필터를 확인하십시오.\n"
 "원래 오류는: %s"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:982
+#: ../libemail-engine/mail-ops.c:940
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d개 중에서 %1$d번째 메시지를 보내는 중"
 
-#: ../libemail-engine/mail-ops.c:1034
+#: ../libemail-engine/mail-ops.c:992
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "%2$d개 중 %1$d번째 메시지를 보내는데 실패했습니다"
 
-#: ../libemail-engine/mail-ops.c:1040
+#: ../libemail-engine/mail-ops.c:998
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1000
 msgid "Complete."
 msgstr "완료."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1154
+#: ../libemail-engine/mail-ops.c:1112
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "메시지를 '%s'에 옮기는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1155
+#: ../libemail-engine/mail-ops.c:1113
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "메시지를 '%s'에 복사하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1274
+#: ../libemail-engine/mail-ops.c:1232
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' 폴더를 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1402
+#: ../libemail-engine/mail-ops.c:1360
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메시지를 비우고 내용을 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1403
+#: ../libemail-engine/mail-ops.c:1361
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1477
+#: ../libemail-engine/mail-ops.c:1435
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중"
@@ -11935,21 +11984,21 @@ msgstr "스풀 디렉터리 '%s'을(를) 만들 수 없습니다: %s"
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "mbox가 아닌 소스 '%s'에서 메일 옮기기를 시도했습니다"
 
-#: ../libemail-engine/mail-tools.c:229
+#: ../libemail-engine/mail-tools.c:237
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "전달한 메시지 - %s"
 
-#: ../libemail-engine/mail-tools.c:231
+#: ../libemail-engine/mail-tools.c:239
 msgid "Forwarded message"
 msgstr "전달한 메시지"
 
-#: ../libemail-engine/mail-vfolder.c:127
+#: ../libemail-engine/mail-vfolder.c:153
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "검색 폴더 설정: %s"
 
-#: ../libemail-engine/mail-vfolder.c:280
+#: ../libemail-engine/mail-vfolder.c:306
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "'%s'에 대한 검색 폴더를 업데이트하는 중 - %s"
@@ -11959,7 +12008,7 @@ msgstr "'%s'에 대한 검색 폴더를 업데이트하는 중 - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:646
+#: ../libemail-engine/mail-vfolder.c:670
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11975,22 +12024,30 @@ msgstr[0] ""
 "다:\n"
 "\"%s\""
 
-#: ../mail/e-mail-account-manager.c:460
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+msgid "Open _Online Accounts"
+msgstr "온라인 계정 열기(_O)"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr "이 계정은 온라인 계정 서비스를 통해 만들었습니다."
+
+#: ../mail/e-mail-account-manager.c:690
 msgid "_Restore Default"
 msgstr "기본값 복원(_R)"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "계정 이름을 끌어 놓으면 정렬 순서를 바꿀 수 있습니다."
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "기본값(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/mail/em-composer-prefs.c:443
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:876
+#: ../plugins/publish-calendar/publish-calendar.c:890
 msgid "Enabled"
 msgstr "사용"
 
@@ -12000,29 +12057,29 @@ msgstr "계정 이름"
 
 #: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3684
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "기본값"
 
-#: ../mail/e-mail-autoconfig.c:525
+#: ../mail/e-mail-autoconfig.c:578
 msgid "No email address provided"
 msgstr "전자메일 주소를 제공하지 않음"
 
-#: ../mail/e-mail-autoconfig.c:534
+#: ../mail/e-mail-autoconfig.c:587
 msgid "Missing domain in email address"
 msgstr "전자메일 주소에 도메인이 없음"
 
-#: ../mail/e-mail-backend.c:766
+#: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "알 수 없는 백그라운드 동작"
 
-#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
-#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "이 창을 닫습니다"
 
-#: ../mail/e-mail-browser.c:280
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -12180,7 +12237,7 @@ msgstr "추가 정보"
 
 #: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
-msgstr "회신 주소(_P):"
+msgstr "답장 주소(_P):"
 
 #: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
@@ -12212,7 +12269,8 @@ msgid "Receiving Email"
 msgstr "메일 받기"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
@@ -12237,22 +12295,22 @@ msgid "Si_gning algorithm:"
 msgstr "서명 알고리즘(_G):"
 
 #: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -12385,38 +12443,30 @@ msgstr "환영합니다"
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/e-mail-display.c:113
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "주소록에 추가(_A)..."
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "이 주소로(_T)"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "이 주소에서(_F)"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
-msgstr "회신 보내기(_R)..."
+msgstr "답장 보내기(_R)..."
 
-#: ../mail/e-mail-display.c:136
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
-msgstr "회신 메시지를 이 주소로 보냅니다"
+msgstr "답장 메시지를 이 주소로 보냅니다"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "검색 폴더 만들기(_F)"
 
-#: ../mail/e-mail-display.c:153
-msgid "Save _Image..."
-msgstr "그림 저장(_I)..."
-
-#: ../mail/e-mail-display.c:155
-msgid "Save the image to a file"
-msgstr "그림을 파일에 저장합니다"
-
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -12427,32 +12477,32 @@ msgstr "정크메일 필터링 소프트웨어:"
 msgid "_Label name:"
 msgstr "레이블 이름(_L):"
 
-#: ../mail/e-mail-label-list-store.c:49
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "중요(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:50
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "업무(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:51
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "개인(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:52
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "할 일(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:53
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "나중에(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:771
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "Add Label"
 msgstr "레이블 추가"
 
@@ -12472,730 +12522,703 @@ msgstr ""
 msgid "Color"
 msgstr "색"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "폴더를 선택하십시오"
+# tooltip
+#: ../mail/e-mail-print-config-headers.c:167
+msgid "Move selected headers to top"
+msgstr "선택한 헤더를 맨 위로 옮깁니다"
 
-#: ../mail/e-mail-printer.c:123
-#, c-format
-msgid "Page %d of %d"
-msgstr "%2$d페이지 중 %1$d페이지"
+# tooltip
+#: ../mail/e-mail-print-config-headers.c:172
+msgid "Move selected headers up one row"
+msgstr "선택한 헤더를 한 줄 위로 옮깁니다"
 
-#: ../mail/e-mail-printer.c:573
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-msgid "Print"
-msgstr "인쇄"
+# tooltip
+#: ../mail/e-mail-print-config-headers.c:177
+msgid "Move selected headers down one row"
+msgstr "선택한 헤더를 한 줄 아래로 옮깁니다"
+
+# tooltip
+#: ../mail/e-mail-print-config-headers.c:182
+msgid "Move selected headers to bottom"
+msgstr "선택한 헤더를 맨 아래로 옮깁니다"
 
-#: ../mail/e-mail-printer.c:579
+#: ../mail/e-mail-print-config-headers.c:187
+msgid "Select all headers"
+msgstr "모든 헤더 선택"
+
+#: ../mail/e-mail-print-config-headers.c:206
 msgid "Header Name"
 msgstr "헤더 이름"
 
-#: ../mail/e-mail-printer.c:585
+#: ../mail/e-mail-print-config-headers.c:215
 msgid "Header Value"
 msgstr "헤더 값"
 
-#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "헤더"
 
-#: ../mail/e-mail-reader.c:347
-msgid "Save Image"
-msgstr "그림 저장"
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "%2$d페이지 중 %1$d페이지"
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "폴더로 복사"
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
 msgid "C_opy"
 msgstr "복사(_O)"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "폴더로 이동"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
 msgid "_Move"
 msgstr "이동(_M)"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것.
 # 주의: 원문 잘못이므로 점 생략.
-#: ../mail/e-mail-reader.c:1311 ../mail/e-mail-reader.c:1511
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1424
 msgid "_Do not ask me again."
 msgstr "다시 묻지 않기(_D)"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것.
 # 주의: 원문 잘못이므로 점 생략.
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1430
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "메일링 리스트의 경우 Reply-To: 무시(_A)"
 
-#: ../mail/e-mail-reader.c:1752
+#: ../mail/e-mail-reader.c:1632
 msgid "Failed to retrieve message:"
 msgstr "메시지를 가져오는데 실패했습니다:"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/e-mail-reader.c:1798 ../mail/e-mail-reader.c:2891
+#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "'%s' 메시지를 가져오는 중"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1860
 msgid "A_dd Sender to Address Book"
 msgstr "보낸 사람을 주소록에 추가(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1862
 msgid "Add sender to address book"
 msgstr "보낸 사람을 주소록에 추가합니다"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1867
 msgid "Check for _Junk"
 msgstr "정크메일 검사(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1869
 msgid "Filter the selected messages for junk status"
 msgstr "선택한 메시지를 정크메일인지 필터링합니다"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1874
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1876
 msgid "Copy selected messages to another folder"
 msgstr "선택한 메시지를 다른 폴더로 복사합니다"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1881
 msgid "_Delete Message"
 msgstr "메시지 삭제(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1883
 msgid "Mark the selected messages for deletion"
 msgstr "선택한 메시지를 지운 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1888
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "메일링 리스트에 대한 필터 규칙 만들기(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "이 메일링 리스트에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1895
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "받는 사람에 대한 필터 규칙 만들기(_R)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages to these recipients"
 msgstr "이 받는 사람에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1902
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "보낸 사람에 대한 필터 규칙 만들기(_N)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages from this sender"
 msgstr "이 보낸 사람이 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1909
 msgid "Create a Filter Rule for _Subject..."
 msgstr "제목에 대한 필터 규칙 만들기(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a rule to filter messages with this subject"
 msgstr "이 제목으로 도착한 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1916
 msgid "A_pply Filters"
 msgstr "필터 적용(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1918
 msgid "Apply filter rules to the selected messages"
 msgstr "선택한 메시지에 필터 규칙을 적용합니다"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1923
 msgid "_Find in Message..."
 msgstr "메시지에서 찾기(_F)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1925
 msgid "Search for text in the body of the displayed message"
 msgstr "표시한 메시지의 본문에서 텍스트를 찾습니다"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1930
 msgid "_Clear Flag"
 msgstr "플래그 지우기(_C)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1932
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "선택한 메시지에서 추가 작업 플래그를 지웁니다"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1937
 msgid "_Flag Completed"
 msgstr "플래그 완료(_F)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1939
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "선택한 메시지의 추가 작업을 마침으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1944
 msgid "Follow _Up..."
 msgstr "추가 작업(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1946
 msgid "Flag the selected messages for follow-up"
 msgstr "선택한 메시지에 추가 작업을 표시합니다"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1951
 msgid "_Attached"
 msgstr "첨부(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
 msgid "Forward the selected message to someone as an attachment"
 msgstr "선택한 메시지를 다른 사람에게 첨부하여 전달합니다"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1958
 msgid "Forward As _Attached"
 msgstr "첨부로 전달(_A)"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1965
 msgid "_Inline"
 msgstr "포함(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2082 ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
 msgid "Forward the selected message in the body of a new message"
 msgstr "선택한 메시지를 새 메시지의 본문으로 전달합니다"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1972
 msgid "Forward As _Inline"
 msgstr "포함해서 전달(_I)"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1979
 msgid "_Quoted"
 msgstr "인용(_Q)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
 msgid "Forward the selected message quoted like a reply"
-msgstr "선택한 메시지를 회신처럼 인용하여 전달합니다"
+msgstr "선택한 메시지를 답장처럼 인용하여 전달합니다"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:1986
 msgid "Forward As _Quoted"
 msgstr "인용해서 전달(_Q)"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:1993
 msgid "_Load Images"
 msgstr "그림 읽어들이기(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:1995
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML 메일의 그림을 강제로 읽어들입니다"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2000
 msgid "_Important"
 msgstr "중요(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as important"
 msgstr "선택한 메시지를 중요한 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2007
 msgid "_Junk"
 msgstr "정크메일(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as junk"
 msgstr "선택한 메시지를 정크메일로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2014
 msgid "_Not Junk"
 msgstr "정크메일 아님(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as not being junk"
 msgstr "선택한 메시지를 정크메일이 아닌 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2021
 msgid "_Read"
 msgstr "읽기(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as having been read"
 msgstr "선택한 메시지를 읽은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2028
 msgid "Uni_mportant"
 msgstr "중요하지 않음(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as unimportant"
 msgstr "선택한 메시지를 중요하지 않은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2035
 msgid "_Unread"
 msgstr "읽기 취소(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2037
 msgid "Mark the selected messages as not having been read"
 msgstr "선택한 메시지를 읽지 않은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2042
 msgid "_Edit as New Message..."
 msgstr "새 메시지로 편집(_E)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2044
 msgid "Open the selected messages in the composer for editing"
 msgstr "선택한 메시지를 메일 작성에서 열어서 편집합니다"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2049
 msgid "Compose _New Message"
 msgstr "새 메시지 작성(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2051
 msgid "Open a window for composing a mail message"
 msgstr "메일 메시지를 작성하는 창을 엽니다"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2056
 msgid "_Open in New Window"
 msgstr "새 창에서 열기(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2058
 msgid "Open the selected messages in a new window"
 msgstr "선택한 메시지를 새 창에서 엽니다"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2063
 msgid "_Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2065
 msgid "Move selected messages to another folder"
 msgstr "선택한 메시지를 다른 폴더로 옮깁니다"
 
-#: ../mail/e-mail-reader.c:2185
-msgid "_Switch to Folder"
-msgstr "폴더로 이동(_S)"
-
-#: ../mail/e-mail-reader.c:2187
-msgid "Display the parent folder"
-msgstr "상위 폴더 표시"
-
-#: ../mail/e-mail-reader.c:2192
-msgid "Switch to _next tab"
-msgstr "다음 탭으로 이동(_N)"
-
-#: ../mail/e-mail-reader.c:2194
-msgid "Switch to the next tab"
-msgstr "다음 탭으로 이동합니다"
-
-#: ../mail/e-mail-reader.c:2199
-msgid "Switch to _previous tab"
-msgstr "이전 탭으로 이동(_P)"
-
-#: ../mail/e-mail-reader.c:2201
-msgid "Switch to the previous tab"
-msgstr "이전 탭으로 이동합니다"
-
-#: ../mail/e-mail-reader.c:2206
-msgid "Cl_ose current tab"
-msgstr "현재 탭 닫기(_O)"
-
-#: ../mail/e-mail-reader.c:2208
-msgid "Close current tab"
-msgstr "현재 탭을 닫습니다"
-
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2070
 msgid "_Next Message"
 msgstr "다음 메시지(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2072
 msgid "Display the next message"
 msgstr "다음의 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2077
 msgid "Next _Important Message"
 msgstr "다음 중요한 메시지(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2079
 msgid "Display the next important message"
 msgstr "다음의 중요한 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2084
 msgid "Next _Thread"
 msgstr "다음 글타래(_T)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2086
 msgid "Display the next thread"
 msgstr "다음의 글타래를 표시합니다"
 
 # 주의: 아래의 Previous Unread Message와 같은 형태로 번역
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2091
 msgid "Next _Unread Message"
 msgstr "읽지 않은 다음 메시지(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next unread message"
 msgstr "다음의 읽지 않은 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2098
 msgid "_Previous Message"
 msgstr "이전 메시지(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the previous message"
 msgstr "이전의 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2105
 msgid "Pr_evious Important Message"
 msgstr "이전의 중요한 메시지(_E)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the previous important message"
 msgstr "이전의 중요한 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2112
 msgid "Previous T_hread"
 msgstr "이전 글타래(_H)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the previous thread"
 msgstr "이전 메시지를 표시합니다"
 
 # 주의: 위의 Next Unread Message와 같은 형태로 번역
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2119
 msgid "P_revious Unread Message"
 msgstr "읽지 않은 이전 메시지(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous unread message"
 msgstr "이전의 읽지 않은 메시지를 표시합니다"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2128
 msgid "Print this message"
 msgstr "이 메시지를 인쇄합니다"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2135
 msgid "Preview the message to be printed"
 msgstr "인쇄할 메시지를 미리 봅니다"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2140
 msgid "Re_direct"
 msgstr "수신만 변경(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2142
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "선택한 메시지의 수신자를 누군가로 돌립니다(반송합니다)"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2147
 msgid "Remo_ve Attachments"
 msgstr "첨부 제거(_V)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2149
 msgid "Remove attachments"
 msgstr "첨부 제거"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2154
 msgid "Remove Du_plicate Messages"
 msgstr "중복 메시지 제거(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2156
 msgid "Checks selected messages for duplicates"
 msgstr "선택한 메시지를 중복으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-#: ../modules/mail/e-mail-attachment-handler.c:196
+#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
-msgstr "전체에 회신(_A)"
+msgstr "전체에 답장(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2163
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "선택한 메시지의 받는 사람 모두에게 회신을 작성합니다"
+msgstr "선택한 메시지의 받는 사람 모두에게 답장을 작성합니다"
 
 # List는 메일링 리스트를 말함.
-#: ../mail/e-mail-reader.c:2311 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
-msgstr "리스트에 회신(_L)"
+msgstr "리스트에 답장(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2170
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "선택한 메시지의 메일링 리스트로 회신을 작성합니다"
+msgstr "선택한 메시지의 메일링 리스트로 답장을 작성합니다"
 
-#: ../mail/e-mail-reader.c:2318
-#: ../modules/mail/e-mail-attachment-handler.c:203
+#: ../mail/e-mail-reader.c:2175
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
-msgstr "보낸 사람에게 회신(_R)"
+msgstr "보낸 사람에게 답장(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2177
 msgid "Compose a reply to the sender of the selected message"
-msgstr "이 메시지를 보낸사람에게 회신을 작성합니다"
+msgstr "이 메시지를 보낸사람에게 답장을 작성합니다"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2182
 msgid "_Save as mbox..."
 msgstr "메일함으로 저장(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2184
 msgid "Save selected messages as an mbox file"
 msgstr "선택한 메시지를 메일함(mbox) 파일로 저장합니다"
 
-#: ../mail/e-mail-reader.c:2332
+#: ../mail/e-mail-reader.c:2189
 msgid "_Message Source"
 msgstr "메시지 원본(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2191
 msgid "Show the raw email source of the message"
 msgstr "메시지의 메일 원본을 표시합니다"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2203
 msgid "_Undelete Message"
 msgstr "메시지 되살리기(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2205
 msgid "Undelete the selected messages"
 msgstr "선택한 메시지를 되살립니다"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2210
 msgid "_Normal Size"
 msgstr "보통 크기(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2212
 msgid "Reset the text to its original size"
 msgstr "글자를 원래 크기로 맞춥니다"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom In"
 msgstr "확대(_Z)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2219
 msgid "Increase the text size"
 msgstr "글자 크기를 키웁니다"
 
-#: ../mail/e-mail-reader.c:2367
+#: ../mail/e-mail-reader.c:2224
 msgid "Zoom _Out"
 msgstr "축소(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2226
 msgid "Decrease the text size"
 msgstr "글자 크기를 줄입니다"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2233
 msgid "Cre_ate"
 msgstr "만들기(_A)"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2240
 msgid "Ch_aracter Encoding"
 msgstr "문자 인코딩(_A)"
 
 # inline, attached, quoted 따위
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2247
 msgid "F_orward As"
 msgstr "전달 방식(_O)"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2254
 msgid "_Group Reply"
-msgstr "그룹 회신(_G)"
+msgstr "그룹 답장(_G)"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2261
 msgid "_Go To"
 msgstr "이동(_G)"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2268
 msgid "Mar_k As"
 msgstr "표시(_K)"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2275
 msgid "_Message"
 msgstr "메시지(_M)"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2282
 msgid "_Zoom"
 msgstr "확대/축소(_Z)"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2292
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "메일링 리스트에 대한 검색 폴더 만들기(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a search folder for this mailing list"
 msgstr "이 메일링 리스트에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2299
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "받는 사람에 대한 검색 폴더 만들기(_T)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a search folder for these recipients"
 msgstr "이 받는 사람에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2306
 msgid "Create a Search Folder from Sen_der..."
 msgstr "보낸 사람에 대한 검색 폴더 만들기(_D)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a search folder for this sender"
 msgstr "이 보낸 사람에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2456
+#: ../mail/e-mail-reader.c:2313
 msgid "Create a Search Folder from S_ubject..."
 msgstr "제목에 대한 검색 폴더 만들기(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2458
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a search folder for this subject"
 msgstr "이 제목에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2338
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2346
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/e-mail-reader.c:2493
+#: ../mail/e-mail-reader.c:2350
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: ../mail/e-mail-reader.c:2497
+#: ../mail/e-mail-reader.c:2354
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2358
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: ../mail/e-mail-reader.c:2505
+#: ../mail/e-mail-reader.c:2362
 msgid "Mark as Uni_mportant"
 msgstr "중요하지 않은 것으로 표시(_M)"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2366
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: ../mail/e-mail-reader.c:2553
+#: ../mail/e-mail-reader.c:2410
 msgid "_Caret Mode"
 msgstr "캐릿 모드(_C)"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2412
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "표시하는 메시지의 본문 안에 깜박이는 커서를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2561
+#: ../mail/e-mail-reader.c:2418
 msgid "All Message _Headers"
 msgstr "모든 메시지 헤더(_H)"
 
-#: ../mail/e-mail-reader.c:2563
+#: ../mail/e-mail-reader.c:2420
 msgid "Show messages with all email headers"
 msgstr "메일의 모든 헤더와 같이 메시지를 표시합니다"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/e-mail-reader.c:2897
+#: ../mail/e-mail-reader.c:2780
 msgid "Retrieving message"
 msgstr "메시지 가져오기"
 
-#: ../mail/e-mail-reader.c:3877
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:3702
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "전달(_F)"
 
-#: ../mail/e-mail-reader.c:3878
+#: ../mail/e-mail-reader.c:3703
 msgid "Forward the selected message to someone"
 msgstr "선택한 메시지를 다른 사람에게 전달합니다"
 
-#: ../mail/e-mail-reader.c:3897
+#: ../mail/e-mail-reader.c:3722
 msgid "Group Reply"
-msgstr "그룹 회신"
+msgstr "그룹 답장"
 
 # tooltip
-#: ../mail/e-mail-reader.c:3898
+#: ../mail/e-mail-reader.c:3723
 msgid "Reply to the mailing list, or to all recipients"
-msgstr "메일링 리스트로 회신하거나, 아니면 모든 수신자에게 회신합니다"
+msgstr "메일링 리스트로 답장하거나, 아니면 모든 수신자에게 답장합니다"
 
-#: ../mail/e-mail-reader.c:3964 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "삭제"
 
-#: ../mail/e-mail-reader.c:3997
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../mail/e-mail-reader.c:3801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Next"
 msgstr "다음"
 
-#: ../mail/e-mail-reader.c:4001
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../mail/e-mail-reader.c:3805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Previous"
 msgstr "이전"
 
-#: ../mail/e-mail-reader.c:4010 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
-msgstr "회신"
-
-#: ../mail/e-mail-reader.c:4728
-#, c-format
-msgid "Folder '%s'"
-msgstr "폴더 '%s'"
+msgstr "답장"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것
-#: ../mail/e-mail-reader-utils.c:161
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "다시 경고하지 않기"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장 또는 "-중"과 같이 번역하지 말 것.
-#: ../mail/e-mail-reader-utils.c:962
+#: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "인쇄"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1149
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13205,7 +13228,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "'%s' 폴더에 중복 메시지가 %u개 있습니다. 정말로 삭제하시겠습니까?"
 
-#: ../mail/e-mail-reader-utils.c:1614
+#: ../mail/e-mail-reader-utils.c:2026
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "메시지 저장"
@@ -13215,22 +13238,21 @@ msgstr[0] "메시지 저장"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1635
+#: ../mail/e-mail-reader-utils.c:2047
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "메시지"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장 또는 "-중"과 같이 번역하지 말 것.
-#: ../mail/e-mail-reader-utils.c:2085
+#: ../mail/e-mail-reader-utils.c:2416
 msgid "Parsing message"
 msgstr "메시지 파싱"
 
-#: ../mail/e-mail-request.c:177
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "'%s' 부분을 읽어들이는데 실패했습니다"
+#: ../mail/e-mail-request.c:182
+msgid "The message has no text content."
+msgstr "메시지에 내용 텍스트가 없습니다."
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메시지 플래그"
 
@@ -13238,7 +13260,7 @@ msgstr "추가 작업 메시지 플래그"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1278
+#: ../mail/em-composer-utils.c:1372
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13247,26 +13269,26 @@ msgstr ""
 "${TimeZone}, ${Sender}:"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1284
+#: ../mail/em-composer-utils.c:1378
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1289
+#: ../mail/em-composer-utils.c:1383
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2611
+#: ../mail/em-composer-utils.c:2528
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 사람"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../mail/em-composer-utils.c:3030
+#: ../mail/em-composer-utils.c:2949
 msgid "Posting destination"
 msgstr "게시물 수신자"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../mail/em-composer-utils.c:3031
+#: ../mail/em-composer-utils.c:2950
 msgid "Choose folders to post the message to."
 msgstr "메시지를 올릴 폴더를 선택하십시오."
 
@@ -13414,7 +13436,7 @@ msgstr "설정 아님"
 msgid "is set"
 msgstr "설정"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "정크메일"
 
@@ -13477,7 +13499,7 @@ msgstr "정규식"
 
 #: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
-msgstr "회신"
+msgstr "답장"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:61
@@ -13581,7 +13603,7 @@ msgstr "용량 제한 사용량 (%s):"
 msgid "Quota usage"
 msgstr "용량 제한 사용량"
 
-#: ../mail/em-folder-properties.c:341
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "폴더 속성"
 
@@ -13611,54 +13633,54 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "메일 폴더 트리"
 
-#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: ../mail/em-folder-tree.c:2133 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
-#: ../mail/em-folder-tree.c:2163
+#: ../mail/em-folder-tree.c:2201
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메시지를 맨 위의 저장고에 넣을 수 없습니다"
 
 # VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "해당 없음"
 
-#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
-#: ../mail/em-folder-utils.c:490
+#: ../mail/em-folder-utils.c:518
 msgid "Move Folder To"
 msgstr "폴더 옮기기"
 
-#: ../mail/em-folder-utils.c:490
+#: ../mail/em-folder-utils.c:518
 msgid "Copy Folder To"
 msgstr "폴더 복사"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:615
 msgid "Create Folder"
 msgstr "폴더 만들기"
 
-#: ../mail/em-folder-utils.c:588
+#: ../mail/em-folder-utils.c:616
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
@@ -13674,8 +13696,8 @@ msgstr "표시된 항목에 구독(_B)"
 msgid "Subscribe To _All"
 msgstr "모든 항목에 구독(_A)"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
@@ -13691,58 +13713,58 @@ msgstr "모든 항목에서 탈퇴(_A)"
 msgid "Folder Subscriptions"
 msgstr "폴더 구독"
 
-#: ../mail/em-subscription-editor.c:1717
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "계정(_A):"
 
-#: ../mail/em-subscription-editor.c:1732
+#: ../mail/em-subscription-editor.c:1729
 msgid "Clear Search"
 msgstr "검색 지우기"
 
-#: ../mail/em-subscription-editor.c:1750
+#: ../mail/em-subscription-editor.c:1746
 msgid "Sho_w items that contain:"
 msgstr "다음이 들어 있는 항목만 표시(_W):"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1795
+#: ../mail/em-subscription-editor.c:1789
 msgid "Subscribe to the selected folder"
 msgstr "선택한 폴더를 구독합니다"
 
-#: ../mail/em-subscription-editor.c:1796
+#: ../mail/em-subscription-editor.c:1790
 msgid "Su_bscribe"
 msgstr "구독(_B)"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1841
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Unsubscribe from the selected folder"
 msgstr "선택한 폴더에서 구독을 중지합니다"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1881
+#: ../mail/em-subscription-editor.c:1875
 msgid "Collapse all folders"
 msgstr "모든 폴더를 줄입니다"
 
-#: ../mail/em-subscription-editor.c:1882
+#: ../mail/em-subscription-editor.c:1876
 msgid "C_ollapse All"
 msgstr "모두 줄이기(_O)"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1892
+#: ../mail/em-subscription-editor.c:1886
 msgid "Expand all folders"
 msgstr "모든 폴더를 펼칩니다"
 
-#: ../mail/em-subscription-editor.c:1893
+#: ../mail/em-subscription-editor.c:1887
 msgid "E_xpand All"
 msgstr "모두 펼치기(_X)"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1903
+#: ../mail/em-subscription-editor.c:1897
 msgid "Refresh the folder list"
 msgstr "폴더 목록을 새로 고칩니다"
 
 # tooltip
-#: ../mail/em-subscription-editor.c:1915
+#: ../mail/em-subscription-editor.c:1909
 msgid "Stop the current operation"
 msgstr "현재 동작을 중지합니다"
 
@@ -13750,22 +13772,22 @@ msgstr "현재 동작을 중지합니다"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:97
+#: ../mail/em-utils.c:86
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "정말로 메시지 %d개를 동시에 여시겠습니까?"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "이 메시지 다시 보지 않기(_D)"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "메시지 필터"
 
-#: ../mail/em-utils.c:1060
+#: ../mail/em-utils.c:982
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -13825,13 +13847,13 @@ msgstr "대상 폴더(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "폴더 선택"
 
 #: ../mail/importers/evolution-mbox-importer.c:147
 #: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
@@ -13846,7 +13868,7 @@ msgid "From"
 msgstr "보낸 사람"
 
 #: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:193
+#: ../shell/e-shell-utils.c:172
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버클리 메일박스(mbox)"
 
@@ -13861,7 +13883,7 @@ msgstr "메일함 가져오기"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../plugins/pst-import/pst-importer.c:764
 #, c-format
 msgid "Importing '%s'"
 msgstr "'%s' 가져오는 중입니다"
@@ -13972,11 +13994,11 @@ msgstr "문자 인코딩(_A):"
 
 #: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
-msgstr "회신 및 전달"
+msgstr "답장 및 전달"
 
 #: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
-msgstr "회신 모양(_R):"
+msgstr "답장 모양(_R):"
 
 #: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
@@ -13984,11 +14006,11 @@ msgstr "전달 모양(_F):"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
-msgstr "회신할 때 맨 아래부터 입력 시작(_T)"
+msgstr "답장할 때 맨 아래부터 입력 시작(_T)"
 
 #: ../mail/mail-config.ui.h:15
 msgid "_Keep signature above the original message on replying"
-msgstr "회신할 때 원문 위에 서명 놓기(_K)"
+msgstr "답장할 때 원문 위에 서명 놓기(_K)"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
@@ -13996,52 +14018,77 @@ msgstr "메일링 리스트에서 Reply-To: 무시(_N)"
 
 #: ../mail/mail-config.ui.h:17
 msgid "Gro_up Reply goes only to mailing list, if possible"
-msgstr "그룹 회신은(가능한 경우) 메일링 리스트에만 회신(_U)"
+msgstr "그룹 답장은(가능한 경우) 메일링 리스트에만 답장(_U)"
 
 #: ../mail/mail-config.ui.h:18
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "원문이 서명되어 있으면 디지털 서명하기(PGP 또는 S/MIME)(_S)"
 
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "첨부"
+
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "포함(Outlook 방식)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "인용"
+
+#: ../mail/mail-config.ui.h:22
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "인용하지 않기"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "포함"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "서명(_N)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "서명"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "언어(_L)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
 msgid "Languages Table"
 msgstr "언어 표"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "이 언어 목록은 사전을 설치한 언어만 들어 있습니다."
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "입력할 때 맞춤법 검사(_T)"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "맞춤법이 틀린 글자의 색(_M):"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "맞춤법 검사"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14050,74 +14097,49 @@ msgstr ""
 "문을 합니다:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
 msgstr "제목이 없이 메시지를 보내기(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "숨은 참조로만 메시지를 보내기(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
-msgstr "메일링 리스트 메시지에 개인 회신 보내기(_P)"
+msgstr "메일링 리스트 메시지에 개인 답장 보내기(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
-msgstr "여러 명의 수신자에게 회신을 보내기(_N)"
+msgstr "여러 명의 수신자에게 답장을 보내기(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "메일링 리스트에서 개인 회신을 리스트로 보내기 허용(_M)"
+msgstr "메일링 리스트에서 개인 답장을 리스트로 보내기 허용(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "메일 주소로 입력하지 않은 수신자에게 메시지 보내기(_R){0}"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "확인"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "첨부"
-
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "포함(Outlook 방식)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "인용"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "인용하지 않기"
-
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "포함"
-
 #: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "프록시 설정"
@@ -14283,58 +14305,54 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "메일 미리 보기에서 보낸 사람의 사진 보이기(_S)"
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "로컬 주소록에서만 보낸 사람의 사진 검색(_E)"
-
-#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "표시하는 메시지 헤더"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "메일 헤더 표"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:86
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "날짜/시각 형식"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "받은 메일이 정크 메일인지 검사(_M)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:103
 msgid "_Delete junk messages"
 msgstr "정크 메일 삭제(_D)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_S)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_K)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "로컬 주소록만 찾아 보기(_L)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:107
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션은 무시합니다."
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:109
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:225
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "암호화 없음"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
@@ -14381,11 +14399,11 @@ msgstr "전달"
 
 #: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
-msgstr "회신이 필요 없음"
+msgstr "답장이 필요 없음"
 
 #: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
-msgstr "전체 회신"
+msgstr "전체 답장"
 
 #: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
@@ -14477,9 +14495,13 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"지금 보내려는 연락처 목록에는 그 목록에 들어 있는 받는 사람을 감추도록 설정되어 있습니다.\n"
+"지금 보내려는 연락처 목록에는 그 목록에 들어 있는 받는 사람을 감추도록 설정되"
+"어 있습니다.\n"
 "\n"
-"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메시지에 Apparently-To 헤더를 붙입니다. 그리고 이 헤더에는 메시지를 받는 사람을 모두를 기록하게 됩니다. 이렇게 되지 
않으려면, 최소한 주소를 한 개라도 \"받는 사람:\"이나 \"참조:\"에 쓰십시오."
+"많은 전자메일 시스템에서는, 받는 사람이 BCC만 있는 경우 메시지에 Apparently-"
+"To 헤더를 붙입니다. 그리고 이 헤더에는 메시지를 받는 사람을 모두를 기록하게 "
+"됩니다. 이렇게 되지 않으려면, 최소한 주소를 한 개라도 \"받는 사람:\"이나 \"참"
+"조:\"에 쓰십시오."
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
@@ -14519,7 +14541,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:22
 msgid "Send private reply?"
-msgstr "개인 회신을 보내시겠습니까?"
+msgstr "개인 답장을 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:23
 msgid ""
@@ -14527,12 +14549,12 @@ msgid ""
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
-"메일링 리스트로 받은 메시지에 개인 회신을 하려 하지만, 메일링 리스트에서 리스"
-"트로 회신하도록 정하고 있습니다. 정말로 계속 하시겠습니까?"
+"메일링 리스트로 받은 메시지에 개인 답장을 하려 하지만, 메일링 리스트에서 리스"
+"트로 답장하도록 정하고 있습니다. 정말로 계속 하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:24
 msgid "Reply _Privately"
-msgstr "개인 회신(_P)"
+msgstr "개인 답장(_P)"
 
 #: ../mail/mail.error.xml.h:26
 msgid ""
@@ -14540,19 +14562,19 @@ msgid ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
-"메일링 리스트로 받은 메시지에 회신을 하려 하지만, 메일링 리스트가 아닌 보낸 "
-"사람에게 개인 회신을 하려 합니다. 정말로 계속 하시겠습니까?"
+"메일링 리스트로 받은 메시지에 답장을 하려 하지만, 메일링 리스트가 아닌 보낸 "
+"사람에게 개인 답장을 하려 합니다. 정말로 계속 하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:28
 msgid "Send reply to all recipients?"
-msgstr "모든 수신자에게 회신을 보내시겠습니까?"
+msgstr "모든 수신자에게 답장을 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:29
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
-"많은 수신자에게 보내는 메시지에 회신합니다. 정말로 \"모든\" 수신자에게 회신"
+"많은 수신자에게 보내는 메시지에 답장합니다. 정말로 \"모든\" 수신자에게 답장"
 "을 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:30
@@ -14605,7 +14627,7 @@ msgid ""
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1518
 msgid "_Empty Trash"
 msgstr "지운 메시지 비우기(_E)"
 
@@ -14809,7 +14831,7 @@ msgid "Do _Not Disable"
 msgstr "해제하지 않기(_N)"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:649
 msgid "_Disable"
 msgstr "사용 않음(_D)"
 
@@ -14976,34 +14998,36 @@ msgid "This will mark all messages as read in the selected folder."
 msgstr "선택한 폴더의 모든 메시지를 읽은 것으로 표시합니다."
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr "선택한 폴더와 그 아래 폴더의 모든 메시지를 읽은 것으로 표시합니다."
+msgid "Also mark messages in subfolders?"
+msgstr "아래 폴더의 메시지도 표시하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "메시지 창을 닫습니다."
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"현재 폴더만 읽은 메시지로 표시하시겠습니까? 아니면 현재 폴더와 그 아래 폴더"
+"의 모든 메시지를 모두 읽은 메시지로 표시하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "메시지 창을 닫으시겠습니까?"
+msgid "In Current Folder and _Subfolders"
+msgstr "현재 폴더 및 하위 폴더에서(_S)"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "예(_Y)"
+msgid "In Current _Folder Only"
+msgstr "현재 폴더에서만(_F)"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "아니요(_N)"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr "답장이나 전달할 때 이 창을 닫습니까?"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "항상(_A)"
+msgid "_Yes, Always"
+msgstr "예, 항상(_Y)"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "안 함(_E)"
+msgid "_No, Never"
+msgstr "아니요, 사용 안 함(_N)"
 
 #: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
@@ -15014,101 +15038,121 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "정말로 '{0}' 폴더를 '{1}' 폴더로 복사하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "예(_Y)"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "아니요(_N)"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "항상(_A)"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "안 함(_E)"
+
+#: ../mail/mail.error.xml.h:142
 msgid "Move folder in folder tree."
 msgstr "폴더를 폴더 트리에 옮기기."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "정말로 '{0}' 폴더를 '{1}' 폴더로 옮기시겠습니까?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "지정한 계정을 사용하는 중이 아니므로 이 메시지를 보낼 수 없습니다."
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr "계정을 사용하도록 만들거나 다른 계정으로 보내 보십시오."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "메일 삭제가 실패했습니다"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "이 메일을 지울 권한이 없습니다."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "\"정크메일 검사\" 실패"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "\"정크메일 알림\" 실패"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"정크메일 아님 알림\" 실패"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "중복 메시지를 제거하시겠습니까?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "중복된 메시지가 없습니다."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "'{0}' 폴더에 중복 메시지가 없습니다."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; 계정에 연결을 끊는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; 폴더 구독 해제에 실패했습니다."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "메시지를 가져올 수 없습니다."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "폴더를 여는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "중복 메시지를 찾는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "메시지를 가져오는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to mark messages as read."
+msgstr "메시지를 읽은 것으로 표시하는데 실패했습니다."
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "메시지에서 첨부 파일을 제거하는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr "연결 중지 상태 사용 용도로 메시지 다운로드에 실패했습니다."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "메시지를 디스크에 저장하는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
 msgstr "숨긴 파일을 첨부했습니다."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15116,19 +15160,19 @@ msgstr ""
 "이름이 {0}인 첨부 파일은 숨긴 파일이므로 민감한 데이터가 들어 있을 수도 있습"
 "니다. 보내기 전에 확인하십시오."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "인쇄 실패."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "프린터 응답은 &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 msgid "Could not perform this operation on {0}."
 msgstr "이 작업을 {0}에 수행할 수 없습니다."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:172
 msgid "You must be working online to complete this operation."
 msgstr "이 작업을 끝마치려면 온라인에서 작업해야 합니다."
 
@@ -15144,7 +15188,7 @@ msgstr "메일 보내고 받기"
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
 msgid "Updating..."
 msgstr "업데이트 중..."
 
@@ -15169,87 +15213,86 @@ msgstr "검색 폴더 편집"
 msgid "New Search Folder"
 msgstr "새 검색 폴더"
 
-#: ../mail/message-list.c:1244
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: ../mail/message-list.c:1245
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "봤음"
 
-#: ../mail/message-list.c:1246
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "응답함"
 
-#: ../mail/message-list.c:1247
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "전달함"
 
-#: ../mail/message-list.c:1248
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메시지"
 
-#: ../mail/message-list.c:1249
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "여러 메시지"
 
-#: ../mail/message-list.c:1253
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: ../mail/message-list.c:1254
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "낮음"
 
-#: ../mail/message-list.c:1258
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "높음"
 
-#: ../mail/message-list.c:1259
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "가장 높음"
 
+#: ../mail/message-list.c:466 ../mail/message-list.c:5717
+msgid "Generating message list"
+msgstr "메시지 목록 작성중"
+
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:242
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: ../mail/message-list.c:1898
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: ../mail/message-list.c:1910
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1918
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%b %d일 %p %l:%M"
 
-#: ../mail/message-list.c:1920
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%Y년 %b %d일"
 
-#: ../mail/message-list.c:2751
+#: ../mail/message-list.c:2767
 msgid "Select all visible messages"
 msgstr "모든 보이는 메시지 선택"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "메시지"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4114
+#: ../mail/message-list.c:4762
 msgid "Follow-up"
 msgstr "추가 작업"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
-msgid "Generating message list"
-msgstr "메시지 목록 작성중"
-
-#: ../mail/message-list.c:4850
+#: ../mail/message-list.c:5655
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -15260,7 +15303,7 @@ msgstr ""
 "메시지 표시 필터를 만들거나, 검색->지우기 메뉴 항목으로 검색을 비우거나 위의 "
 "질의를 바꿔서 새로 검색을 실행해 검색 기준을 바꾸십시오."
 
-#: ../mail/message-list.c:4855
+#: ../mail/message-list.c:5663
 msgid "There are no messages in this folder."
 msgstr "이 폴더에는 메시지가 없습니다."
 
@@ -15297,51 +15340,51 @@ msgid "Subject or Addresses contains"
 msgstr "제목이나 주소에 포함"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Recipients contain"
 msgstr "받는 사람에 포함"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Message contains"
 msgstr "메시지에 포함"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../modules/mail/e-mail-shell-view-actions.c:2015
 msgid "Subject contains"
 msgstr "제목에 포함"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Sender contains"
 msgstr "보낸 사람에 포함"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 msgid "Body contains"
 msgstr "본문에 포함"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:92
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "테이블 열(_T):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../modules/addressbook/autocompletion-config.c:95
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "주소 형식"
 
-#: ../modules/addressbook/autocompletion-config.c:98
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "주소를 해당하는 국가의 표준에 맞게 형식 맞추기(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:107
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "자동 완성"
 
-#: ../modules/addressbook/autocompletion-config.c:110
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "항상 주소록에서 자동 완성한 메일 주소를 표시(_S)"
 
@@ -15365,42 +15408,42 @@ msgstr "연락처 정보"
 msgid "Contact information for %s"
 msgstr "%s에 대한 연락처 정보"
 
-#: ../modules/addressbook/e-book-shell-backend.c:260
+#: ../modules/addressbook/e-book-shell-backend.c:259
 #: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "연락처(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:271
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Create a new contact"
 msgstr "새로운 연락처를 만듭니다"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "연락처 목록(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "주소록(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new address book"
 msgstr "새 주소록을 만듭니다"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "인증서"
 
@@ -15409,290 +15452,302 @@ msgid "Address Book Properties"
 msgstr "주소록 속성"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:418
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:479
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
 msgid "Save as vCard"
 msgstr "vCard 형식으로 저장"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "Co_py All Contacts To..."
 msgstr "모든 연락처 복사(_P)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:845
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Copy the contacts of the selected address book to another"
 msgstr "선택한 주소록의 연락처를 다른 주소록에 복사합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:850
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "D_elete Address Book"
 msgstr "주소록 삭제(_E)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:852
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Delete the selected address book"
 msgstr "선택한 주소록을 삭제합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "Mo_ve All Contacts To..."
 msgstr "모든 연락처 이동(_V)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move the contacts of the selected address book to another"
 msgstr "선택한 주소록의 연락처를 다른 주소록으로 옮깁니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Address Book"
 msgstr "새 주소록(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "Address _Book Properties"
 msgstr "주소록 속성(_B)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:873
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Show properties of the selected address book"
 msgstr "선택한 주소록의 속성을 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "새로 고침(_F)"
+
+# tooltip
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+msgid "Refresh the selected address book"
+msgstr "선택한 주소록을 새로 고칩니다"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "Address Book _Map"
 msgstr "주소록 지도(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Show map with all contacts from selected address book"
 msgstr "선택한 주소록의 모든 연락처에 지도를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/addressbook/e-book-shell-view-actions.c:931
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
 msgid "Rename the selected address book"
 msgstr "선택한 주소록 이름을 바꿉니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Stop loading"
 msgstr "읽어들이기를 중지합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "_Copy Contact To..."
 msgstr "연락처 복사(_C)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Copy selected contacts to another address book"
 msgstr "선택한 연락처를 다른 주소록에 복사합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
 msgid "_Delete Contact"
 msgstr "연락처 삭제(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "_Find in Contact..."
 msgstr "연락처에서 찾기(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Search for text in the displayed contact"
 msgstr "표시한 연락처에서 텍스트를 찾습니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_Forward Contact..."
 msgstr "연락처 전달(_F)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Send selected contacts to another person"
 msgstr "선택한 연락처를 다른 사람에게 보냅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "_Move Contact To..."
 msgstr "연락처 이동(_M)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Move selected contacts to another address book"
 msgstr "선택한 연락처를 다른 주소록에 옮깁니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
 msgid "_New Contact..."
 msgstr "새 연락처(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "New Contact _List..."
 msgstr "새 연락처 목록(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
 msgid "_Open Contact"
 msgstr "연락처 열기(_O)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "View the current contact"
 msgstr "현재 연락처를 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Send Message to Contact..."
 msgstr "연락처로 메시지 보내기(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Send a message to the selected contacts"
 msgstr "선택한 연락처로 메시지를 보냅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "동작(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1774
 msgid "_Preview"
 msgstr "미리 보기(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/mail/e-mail-shell-view-actions.c:1525
 msgid "_Properties"
 msgstr "속성(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Address Book Map"
 msgstr "주소록 지도"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Contact _Preview"
 msgstr "연락처 미리 보기(_P)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Show contact preview window"
 msgstr "연락처 미리 보기 창을 봅니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1078
 msgid "Show _Maps"
 msgstr "지도 표시(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Show maps in contact preview window"
 msgstr "연락처 미리 보기 창에 지도를 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1049
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1904
 msgid "_Classic View"
 msgstr "전통적으로 보기(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Show contact preview below the contact list"
 msgstr "연락처 목록 아래에 연락처 미리 보기를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/addressbook/e-book-shell-view-actions.c:1106
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1911
 msgid "_Vertical View"
 msgstr "세로로 보기(_V)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Show contact preview alongside the contact list"
 msgstr "연락처 목록과 나란히 연락처 미리 보기를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "맞지 않음"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1083
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
-#: ../shell/e-shell-content.c:657
+#: ../modules/addressbook/e-book-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "고급 검색"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
 msgid "Print all shown contacts"
 msgstr "표시된 모든 연락처를 인쇄합니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
 msgid "Preview the contacts to be printed"
 msgstr "인쇄할 연락처를 미리 봅니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:1180
 msgid "Print selected contacts"
 msgstr "선택한 연락처를 인쇄합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "S_ave Address Book as vCard"
 msgstr "주소록을 VCard 형식으로 저장(_A)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1197
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "선택한 주소록의 연락처를 VCard 형식으로 저장합니다"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1153
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1203
+#: ../modules/addressbook/e-book-shell-view-actions.c:1213
 msgid "_Save as vCard..."
 msgstr "vCard로 저장(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
 msgid "Save selected contacts as a vCard"
 msgstr "선택한 연락처를 VCard 형식으로 저장합니다"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "연락처 전달(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "연락처 전달(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "메시지를 연락처에 보내기(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "메시지를 목록에 보내기(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "메시지를 연락처에 보내기(_S)"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
+#: ../modules/audio-inline/e-mail-formatter-audio.c:316
 msgid "Audio Player"
 msgstr "오디오 플레이어"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:317
 msgid "Play the attachment in embedded audio player"
 msgstr "첨부 파일을 내장 오디오 플레이어에서 재생"
 
@@ -15775,83 +15830,83 @@ msgid "With Graphical User Interface"
 msgstr "그래픽 사용자 인터페이스 사용"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:317
-#: ../modules/backup-restore/evolution-backup-tool.c:511
+#: ../modules/backup-restore/evolution-backup-tool.c:322
+#: ../modules/backup-restore/evolution-backup-tool.c:516
 msgid "Shutting down Evolution"
 msgstr "에볼루션을 종료하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:326
+#: ../modules/backup-restore/evolution-backup-tool.c:331
 msgid "Backing Evolution accounts and settings"
 msgstr "에볼루션 계정 및 설정을 백업하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:343
+#: ../modules/backup-restore/evolution-backup-tool.c:348
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "에볼루션 데이터를 백업하는 중(메일, 연락처, 달력, 작업, 메모)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:359
+#: ../modules/backup-restore/evolution-backup-tool.c:364
 msgid "Back up complete"
 msgstr "백업 완료"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:366
-#: ../modules/backup-restore/evolution-backup-tool.c:698
+#: ../modules/backup-restore/evolution-backup-tool.c:371
+#: ../modules/backup-restore/evolution-backup-tool.c:703
 msgid "Restarting Evolution"
 msgstr "에볼루션 다시 시작하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:517
+#: ../modules/backup-restore/evolution-backup-tool.c:522
 msgid "Back up current Evolution data"
 msgstr "현재 에볼루션 데이터를 백업"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:529
 msgid "Extracting files from back up"
 msgstr "백업에서 파일을 추출하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:606
+#: ../modules/backup-restore/evolution-backup-tool.c:611
 msgid "Loading Evolution settings"
 msgstr "에볼루션 설정을 읽어오는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:672
+#: ../modules/backup-restore/evolution-backup-tool.c:677
 msgid "Removing temporary back up files"
 msgstr "임시 백업 파일을 삭제하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:683
+#: ../modules/backup-restore/evolution-backup-tool.c:688
 msgid "Reloading registry service"
 msgstr "레지스트리 서비스를 다시 읽어들이는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:910
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 msgid "Evolution Back Up"
 msgstr "에볼루션 백업"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s 폴더에 백업하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 msgid "Evolution Restore"
 msgstr "에볼루션 복구"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s 폴더에서 복구하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:986
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Backing up Evolution Data"
 msgstr "에볼루션 데이터를 백업하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:987
+#: ../modules/backup-restore/evolution-backup-tool.c:992
 msgid "Please wait while Evolution is backing up your data."
 msgstr "에볼루션에서 데이터를 백업하는 동안 잠시 기다리십시오."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:989
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Restoring Evolution Data"
 msgstr "에볼루션 데이터를 복구하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:990
+#: ../modules/backup-restore/evolution-backup-tool.c:995
 msgid "Please wait while Evolution is restoring your data."
 msgstr "에볼루션에서 데이터를 복구하는 동안 잠시 기다리십시오."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1012
+#: ../modules/backup-restore/evolution-backup-tool.c:1017
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "이 작업은 계정의 데이터 크기에 따라 시간이 걸릴 수도 있습니다."
 
@@ -16005,7 +16060,7 @@ msgstr "LDAP 사용"
 
 # 진행 상태가 아니라 설정 창의 제목, "~하는 중"으로 번역하지 말 것
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/mail/e-mail-shell-view.c:117
 msgid "Searching"
 msgstr "검색"
 
@@ -16141,12 +16196,12 @@ msgstr "생일 및 기념일 달력에서 사용"
 msgid "Default User Calendar"
 msgstr "기본 사용자 달력"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "'%s' 사용자의 구글 암호를 입력하십시오."
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "사용자가 암호 입력을 거부했습니다"
 
@@ -16170,148 +16225,148 @@ msgstr "파일:"
 msgid "Allow Evolution to update the file"
 msgstr "에볼루션에서 파일 업데이트 허용"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:318
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "가져오기(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "달력 선택"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "작업 목록 선택"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "달력으로 가져오기(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:448
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "작업으로 가져오기(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:401
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "알림 용도로 선택한 달력"
 
-#: ../modules/calendar/e-calendar-preferences.c:822
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "날짜 및 시각(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:823
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "날짜만(_D):"
 
 # 단위, "Shows a reminder ___ Days before ..."
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "분"
 
 # 단위, "Shows a reminder ___ Days before ..."
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "시간"
 
 # 단위, "Shows a reminder ___ Days before ..."
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "일"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60분"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30분"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15분"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10분"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05분"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "보조 표준 시간대(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(일별 보기에 표시)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "시스템 표준 시간대 사용(_Y)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "시간 형식:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12시간(오전/오후)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24시간"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Work Week"
 msgstr "근무 주"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "시작 요일(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "근무 요일:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "하루의 시작(_D):"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "월(_M)"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "화(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "수(_W)"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "목(_H)"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "금(_F)"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "토(_S)"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "일(_U)"
 
@@ -16425,62 +16480,67 @@ msgstr "%u 및 %d 기호는 전자메일 주소의 사용자와 도메인으로
 msgid "Publishing Information"
 msgstr "게시 정보"
 
-#: ../modules/calendar/e-cal-shell-backend.c:310
+#: ../modules/calendar/e-cal-shell-backend.c:313
 #: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: ../modules/calendar/e-cal-shell-backend.c:319
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:321
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1521
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:326
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "하루 종일 약속(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:333
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:343
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:668
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "달력 및 작업"
 
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "'%s' 달력을 여는 중"
+
 # a11y
-#: ../modules/calendar/e-cal-shell-sidebar.c:565
+#: ../modules/calendar/e-cal-shell-sidebar.c:591
 msgid "Calendar Selector"
 msgstr "달력 선택"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:868
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "'%s' 달력을 여는 중"
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "인쇄"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
@@ -16492,7 +16552,9 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "이 작업은 선택한 기간보다 오래 된 행사를 모두 영구적으로 지우게 됩니다. 계속하시면, 이 행사를 복구할 수 없게 됩니다."
+msgstr ""
+"이 작업은 선택한 기간보다 오래 된 행사를 모두 영구적으로 지우게 됩니다. 계속"
+"하시면, 이 행사를 복구할 수 없게 됩니다."
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> 행사, Microsoft Office XP 참고
@@ -16502,367 +16564,361 @@ msgstr "이 작업은 선택한 기간보다 오래 된 행사를 모두 영구
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "항목을 복사하는 중"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:881
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "항목을 옮기는 중"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1211
 msgid "event"
 msgstr "행사"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1213
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "iCalendar 형식으로 저장"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "D_elete Calendar"
 msgstr "달력 삭제(_E)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete the selected calendar"
 msgstr "선택한 달력을 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Go Back"
 msgstr "뒤로 이동"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Go Forward"
 msgstr "앞으로 이동"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Select today"
 msgstr "오늘 선택"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select _Date"
 msgstr "날짜 선택(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Select a specific date"
 msgstr "지정한 날짜 선택"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "완전히 지우기(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Purge old appointments and meetings"
 msgstr "지나간 약속과 모임을 완전히 지웁니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
-msgid "Re_fresh"
-msgstr "새로 고침(_F)"
-
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Refresh the selected calendar"
 msgstr "선택한 달력을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Rename the selected calendar"
 msgstr "선택한 달력 이름을 바꿉니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Find _next"
 msgstr "다음 찾기(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Find next occurrence of the current search string"
 msgstr "현재 검색 문자열의 다음 해당 문구를 찾습니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Find _previous"
 msgstr "이전 찾기(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Find previous occurrence of the current search string"
 msgstr "현재 검색 문자열의 이전 해당 문구를 찾습니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Stop _running search"
 msgstr "검색 실행 중지(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Stop currently running search"
 msgstr "현재 실행 중인 검색을 중지합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Show _Only This Calendar"
 msgstr "이 달력만 표시(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Delete Appointment"
 msgstr "약속 삭제(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "Delete selected appointments"
 msgstr "선택한 약속을 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete This _Occurrence"
 msgstr "이 경우 삭제(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Delete this occurrence"
 msgstr "이 경우를 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete All Occ_urrences"
 msgstr "모든 경우 삭제(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Delete all occurrences"
 msgstr "모든 경우를 삭제합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "New All Day _Event..."
 msgstr "새 하루 종일 행사(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Create a new all day event"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "New _Meeting..."
 msgstr "새 모임(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Create a new meeting"
 msgstr "새 모임을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우 옮길 수 있게 만들기(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "View the current appointment"
 msgstr "현재 약속을 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "_Reply"
-msgstr "회신(_R)"
+msgstr "답장(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1554
 msgid "_Schedule Meeting..."
 msgstr "모임 정하기(_S)..."
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Converts an appointment to a meeting"
 msgstr "약속을 모임으로 변환합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Conv_ert to Appointment..."
 msgstr "약속으로 변환(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Converts a meeting to an appointment"
 msgstr "모임을 약속으로 변환합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
 msgid "Quit"
 msgstr "끝내기"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Day"
 msgstr "하루"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Show one day"
 msgstr "하루씩 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "List"
 msgstr "목록"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Show as list"
 msgstr "목록으로 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Month"
 msgstr "한 달"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1704
 msgid "Show one month"
 msgstr "한 달씩 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Week"
 msgstr "한 주씩"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Show one week"
 msgstr "한 주씩 봅니다"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Show one work week"
 msgstr "한 주씩 근무일 기준으로 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Active Appointments"
 msgstr "활성화한 약속"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7일 간의 약속"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-cal-shell-view-actions.c:1747
 msgid "Occurs Less Than 5 Times"
 msgstr "5번 미만 해당"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1802
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1809
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1785
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Print this calendar"
 msgstr "이 달력을 인쇄합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
 msgid "Preview the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1850
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "iCalendar로 저장(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1903
 msgid "Go To"
 msgstr "이동"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "메모"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "새 메모(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
 #: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "새 메모를 만듭니다"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "메모 열기(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "선택한 메모를 봅니다"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "선택한 메모를 인쇄합니다"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:1600
 msgid "Searching next matching event"
 msgstr "일치하는 다음 이벤트 찾는 중"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1510
+#: ../modules/calendar/e-cal-shell-view-private.c:1601
 msgid "Searching previous matching event"
 msgstr "일치하는 이전 이벤트 찾는 중"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1531
+#: ../modules/calendar/e-cal-shell-view-private.c:1622
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "다음 %d년 안에 일치하는 이벤트를 찾지 못했습니다"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1535
+#: ../modules/calendar/e-cal-shell-view-private.c:1626
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "이전 %d년 안에 일치하는 이벤트를 찾지 못했습니다"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1560
+#: ../modules/calendar/e-cal-shell-view-private.c:1651
 msgid "Cannot search with no active calendar"
 msgstr "활성화한 달력이 없으면 검색할 수 없습니다"
 
@@ -16871,22 +16927,22 @@ msgstr "활성화한 달력이 없으면 검색할 수 없습니다"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "작업"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "선택한 작업을 마친 것으로 표시합니다"
 
@@ -16895,38 +16951,38 @@ msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "선택한 작업을 미완료로 표시합니다"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
 #: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "작업 열기(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "선택한 작업을 봅니다"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "선택한 작업을 인쇄합니다"
 
 #: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:216
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "새 메모 목록"
 
@@ -16950,111 +17006,111 @@ msgid "Memo Li_st"
 msgstr "메모 목록(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "새 메모 목록을 만듭니다"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:499
-msgid "Memo List Selector"
-msgstr "메모 목록 선택"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:755
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "'%s' 메모 목록을 여는 중"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-sidebar.c:547
+msgid "Memo List Selector"
+msgstr "메모 목록 선택"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "메모 인쇄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:288
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "메모 목록 속성"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "메모 삭제(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "메모에서 찾기(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "표시한 메모에서 텍스트를 찾습니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "메모 목록 삭제(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "선택한 메모 목록을 삭제합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "새 메모 목록(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "선택한 메모 목록을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "선택한 메모 목록의 이름을 바꿉니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "이 메모 목록만 표시(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "메모 미리 보기(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "메모 미리 보기 창 보기"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "메모 목록 아래에 메모 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "메모 목록과 나란히 메모 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "메모 목록 인쇄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "인쇄할 메모 목록을 미리 봅니다"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "메모 삭제"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "메모 삭제"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:465
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:469
-#: ../modules/calendar/e-task-shell-view-private.c:639
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
 #, c-format
 msgid "%d selected"
 msgstr "%d개 선택"
 
 #: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:239
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "새 작업 목록"
 
@@ -17078,29 +17134,29 @@ msgid "Tas_k List"
 msgstr "작업 목록(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:499
-msgid "Task List Selector"
-msgstr "작업 목록 선택"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:755
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "'%s' 작업 목록을 여는 중"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-sidebar.c:547
+msgid "Task List Selector"
+msgstr "작업 목록 선택"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:311
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "작업 목록 속성"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17109,745 +17165,746 @@ msgid ""
 msgstr ""
 "마쳤다고 표시한 작업을 모두 지우게 됩니다. 계속하시면, 이 작업을 복구할 수 없게 됩니다.\n"
 "\n"
-"정말로 이 작업들을 지우시겠습니까?"
+"정말로 이 작업을 지우시겠습니까?"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "다시 묻지 않기"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "작업 삭제(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "작업에서 찾기(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "표시한 작업에서 텍스트를 찾습니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "복사..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "작업 목록 삭제(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "선택한 작업 목록을 삭제합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "새 작업 목록(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "선택한 작업 목록을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "선택한 작업 목록 이름을 바꿉니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "이 작업 목록만 표시(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "작업 미완료 표시(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "끝마친 작업을 삭제합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "작업 미리 보기(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "작업 미리 보기 창 보기"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "작업 목록 아래에 작업 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "작업 목록과 나란히 작업 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7일 간의 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "마감이 지난 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "작업 목록 인쇄"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "인쇄할 작업 목록을 미리 봅니다"
 
-#: ../modules/calendar/e-task-shell-view.c:371
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "작업 삭제"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "작업 삭제"
 
-#: ../modules/calendar/e-task-shell-view-private.c:524
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr "지운 메시지 비우는 중"
 
-#: ../modules/calendar/e-task-shell-view-private.c:635
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "이 부분을 초대로 표시합니다"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:233
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:237
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:246
+#: ../modules/itip-formatter/itip-view.c:248
 msgid "Today %l:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:261
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:270
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M %p"
 msgstr "내일 %p %l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:274
+#: ../modules/itip-formatter/itip-view.c:276
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "내일 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:295
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:298
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:307
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:311
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:320
+#: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
 msgstr "%B %e일 %A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:326
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
 msgstr "%B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:335
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:339
+#: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %e일 %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
 msgstr "%Y년 %B %e일 %A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:350
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y년 %B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y년 %B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:359
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:363
+#: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:402
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:492
-#: ../modules/itip-formatter/itip-view.c:581
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 msgid "An unknown person"
 msgstr "모르는 사람"
 
-#: ../modules/itip-formatter/itip-view.c:406
-#: ../modules/itip-formatter/itip-view.c:496
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "%s 자격으로 응답하십시오"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "%s 자격으로 받음"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s님이 %s을(를) 통해 다음 모임 정보를 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:417
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s님이 다음 모임 정보를 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s님이 다음 모임을 위임했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:423
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s님이 %s을(를) 통해 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s님이 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:431
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s님이 %s을(를) 통해 기존 모임에 참석하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s님이 기존 모임에 참석하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:437
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s님이 %s을(를) 통해 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s님이 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:443
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s님이 %s을(를) 통해 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s님이 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:449
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s님이 %s을(를) 통해 다음 모임을 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s님이 다음 모임을 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:455
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s님이 %s을(를) 통해 다음 모임 변경을 제안했습니다."
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s님이 다음 모임 변경을 제안했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:461
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s님이 %s을(를) 통해 다음 모임 변경을 거절했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s님이 다음 모임 변경을 거절했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s님이 %s을(를) 통해 다음 작업을 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s님이 다음 작업을 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s님이 다음 작업에 %s님의 할당을 요청했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:513
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s님이 %s을(를) 통해 작업을 할당했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s님이 작업을 할당했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:521
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s님이 %s을(를) 통해 기존 작업에 참여하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s님이 기존 작업에 참여하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:527
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s님이 %s을(를) 통해 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s님이 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
 # FIXME: through what?
-#: ../modules/itip-formatter/itip-view.c:533
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s님이 %s을(를) 통해 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s님이 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:539
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s님이 %s을(를) 통해 다음 할당 작업을 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s님이 다음 할당 작업을 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:545
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s님이 %s을(를) 통해 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s님이 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:551
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s님이 %s을(를) 통해 다음 작업 할당을 거절했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s님이 다음 작업 할당을 거절했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s님이 %s을(를) 통해 다음 메모를 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s님이 다음 메모를 게시했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s님이 %s을(를) 통해 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s님이 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../modules/itip-formatter/itip-view.c:605
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s님이 %s을(를) 통해 다음 공유 메모를 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s님이 다음 공유 메모를 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "All day:"
 msgstr "하루 종일:"
 
-#: ../modules/itip-formatter/itip-view.c:686
+#: ../modules/itip-formatter/itip-view.c:688
 msgid "Start day:"
 msgstr "시작 날짜:"
 
-#: ../modules/itip-formatter/itip-view.c:686
-#: ../modules/itip-formatter/itip-view.c:1465
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
 msgid "Start time:"
 msgstr "시작 시각:"
 
-#: ../modules/itip-formatter/itip-view.c:695
+#: ../modules/itip-formatter/itip-view.c:697
 msgid "End day:"
 msgstr "끝 날짜:"
 
-#: ../modules/itip-formatter/itip-view.c:695
-#: ../modules/itip-formatter/itip-view.c:1466
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
 msgid "End time:"
 msgstr "마침 시각:"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "Ope_n Calendar"
 msgstr "달력 열기(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Decline all"
 msgstr "모두 거부(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Decline"
 msgstr "거부(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Tentative all"
 msgstr "모두 잠정적(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Tentative"
 msgstr "잠정적(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "Acce_pt all"
 msgstr "모두 수락(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "Acce_pt"
 msgstr "수락(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "Send _Information"
 msgstr "정보 보내기(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "_Update Attendee Status"
 msgstr "참석자 상태 업데이트(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Update"
 msgstr "업데이트(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1468
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1587
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
 msgid "Comment:"
 msgstr "설명:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1529
 msgid "Send reply to sender"
-msgstr "보낸 이에게 회신"
+msgstr "보낸 이에게 답장"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1544
 msgid "Send _updates to attendees"
 msgstr "참석자에게 업데이트 보내기(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1522
+#: ../modules/itip-formatter/itip-view.c:1547
 msgid "_Apply to all instances"
 msgstr "모든 경우에 적용(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1523
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Show time as _free"
 msgstr "시간을 약속 없음으로 표시(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1524
+#: ../modules/itip-formatter/itip-view.c:1549
 msgid "_Preserve my reminder"
 msgstr "내 미리 알림 유지(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1525
+#: ../modules/itip-formatter/itip-view.c:1550
 msgid "_Inherit reminder"
 msgstr "미리 알림 상속(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1853
+#: ../modules/itip-formatter/itip-view.c:1880
 msgid "_Tasks:"
 msgstr "작업(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1856
+#: ../modules/itip-formatter/itip-view.c:1883
 msgid "_Memos:"
 msgstr "메모(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3086
+#: ../modules/itip-formatter/itip-view.c:3111
 msgid "Sa_ve"
 msgstr "저장(_V)"
 
+#: ../modules/itip-formatter/itip-view.c:3571
+#: ../modules/itip-formatter/itip-view.c:5016
+msgid "Attendee status updated"
+msgstr "참석자 상태를 업데이트했습니다"
+
 # event -> 행사, Microsoft Office XP 참고
-#: ../modules/itip-formatter/itip-view.c:3651
+#: ../modules/itip-formatter/itip-view.c:3750
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' 달력에 들어 있는 약속이 이 모임과 충돌합니다"
 
-#: ../modules/itip-formatter/itip-view.c:3680
+#: ../modules/itip-formatter/itip-view.c:3779
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' 달력에 약속을 발견했습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3892
 msgid "Unable to find any calendars"
 msgstr "달력을 하나도 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3801
+#: ../modules/itip-formatter/itip-view.c:3900
 msgid "Unable to find this meeting in any calendar"
 msgstr "어느 달력에서도 이 모임을 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3806
+#: ../modules/itip-formatter/itip-view.c:3905
 msgid "Unable to find this task in any task list"
 msgstr "어느 작업 목록에서도 이 작업을 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3811
+#: ../modules/itip-formatter/itip-view.c:3910
 msgid "Unable to find this memo in any memo list"
 msgstr "어느 메모 목록에서도 이 메모를 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4162
+#: ../modules/itip-formatter/itip-view.c:4254
 msgid "Opening the calendar. Please wait..."
 msgstr "달력을 여는 중입니다. 잠시 기다리십시오..."
 
-#: ../modules/itip-formatter/itip-view.c:4167
+#: ../modules/itip-formatter/itip-view.c:4259
 msgid "Searching for an existing version of this appointment"
 msgstr "이 약속의 현재 버전을 찾는 중입니다"
 
-#: ../modules/itip-formatter/itip-view.c:4557
+#: ../modules/itip-formatter/itip-view.c:4652
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목을 '%s' 달력에 보낼 수 없습니다.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4573
+#: ../modules/itip-formatter/itip-view.c:4667
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력에 수락이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4578
+#: ../modules/itip-formatter/itip-view.c:4672
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력에 미정이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4584
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력에 거절이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4590
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력에 취소라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4611
-#: ../modules/itip-formatter/itip-view.c:5052
-#: ../modules/itip-formatter/itip-view.c:5159
+#: ../modules/itip-formatter/itip-view.c:4705
+#: ../modules/itip-formatter/itip-view.c:5162
+#: ../modules/itip-formatter/itip-view.c:5268
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "바뀐 사항을 달력에 저장하는 중입니다. 잠시 기다리십시오..."
 
-#: ../modules/itip-formatter/itip-view.c:4652
+#: ../modules/itip-formatter/itip-view.c:4746
 msgid "Unable to parse item"
 msgstr "항목을 파싱할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4842
+#: ../modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4857
+#: ../modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보낼 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4911
+#: ../modules/itip-formatter/itip-view.c:5008
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참석자를 업데이트할 수 없습니다. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4918
-msgid "Attendee status updated"
-msgstr "참석자 상태를 업데이트했습니다"
-
-#: ../modules/itip-formatter/itip-view.c:4941
+#: ../modules/itip-formatter/itip-view.c:5051
 msgid "The meeting is invalid and cannot be updated"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5017
+#: ../modules/itip-formatter/itip-view.c:5127
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못된 상태 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5089
-#: ../modules/itip-formatter/itip-view.c:5129
+#: ../modules/itip-formatter/itip-view.c:5199
+#: ../modules/itip-formatter/itip-view.c:5238
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5301
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5306
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5202
+#: ../modules/itip-formatter/itip-view.c:5311
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5213
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임이 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5218
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업이 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5223
+#: ../modules/itip-formatter/itip-view.c:5332
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "메모 정보를 보낼 수 없습니다. 해당 메모가 없습니다"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5288
+#: ../modules/itip-formatter/itip-view.c:5397
 msgid "calendar.ics"
 msgstr "달력.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5402
 msgid "Save Calendar"
 msgstr "달력 저장"
 
-#: ../modules/itip-formatter/itip-view.c:5346
-#: ../modules/itip-formatter/itip-view.c:5359
+#: ../modules/itip-formatter/itip-view.c:5451
+#: ../modules/itip-formatter/itip-view.c:5464
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력이 잘못되었습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5347
-#: ../modules/itip-formatter/itip-view.c:5360
+#: ../modules/itip-formatter/itip-view.c:5452
+#: ../modules/itip-formatter/itip-view.c:5465
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17855,16 +17912,16 @@ msgstr ""
 "메시지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 iCalendar가 아닙니"
 "다."
 
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5432
-#: ../modules/itip-formatter/itip-view.c:5532
+#: ../modules/itip-formatter/itip-view.c:5507
+#: ../modules/itip-formatter/itip-view.c:5537
+#: ../modules/itip-formatter/itip-view.c:5638
 msgid "The item in the calendar is not valid"
 msgstr "달력 안이 항목이 올바르지 않습니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5433
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5508
+#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5639
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17872,34 +17929,34 @@ msgstr ""
 "메시지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
 "들어 있지 않습니다."
 
-#: ../modules/itip-formatter/itip-view.c:5448
+#: ../modules/itip-formatter/itip-view.c:5553
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력에 여러 개의 항목이 들어 있습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5449
+#: ../modules/itip-formatter/itip-view.c:5554
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "이 항목을 모두 처리하려면, 파일을 저장해서 그 달력을 가져와야 합니다."
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:6055
 msgctxt "cal-itip"
 msgid "None"
 msgstr "없음"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:6071
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6231
 msgid "This meeting recurs"
 msgstr "이 약속 반복"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6234
 msgid "This task recurs"
 msgstr "이 작업 반복"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6237
 msgid "This memo recurs"
 msgstr "이 메모 반복"
 
@@ -17907,7 +17964,7 @@ msgstr "이 메모 반복"
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
+"현재 참석자가 아닌 사람이 이 답장을 했습니다. 참석자로 추가하시겠습니까?"
 
 #: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
@@ -17997,7 +18054,7 @@ msgid "Choose a mbox spool directory"
 msgstr "MBOX 스풀 디렉터리를 선택하십시오"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:80
 #: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
@@ -18034,23 +18091,23 @@ msgstr "연결 뒤에 STARTTLS"
 msgid "SSL on a dedicated port"
 msgstr "SSL, 특정 포트 사용"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "'sendmail' 대신 지정한 실행 파일 사용(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "사용자 설정 실행 파일(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "사용자 설정 인자 사용(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "사용자 설정 인자(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18060,6 +18117,10 @@ msgstr ""
 "   %F - 보낸 사람 주소\n"
 "   %R - 받는 사람 주소"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+msgid "Send mail also when in offline _mode"
+msgstr "오프라인 모드에서도 메일 보내기(_M)"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "서버에 인증이 필요(_V)"
@@ -18076,472 +18137,479 @@ msgstr "야후! 기능"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "야후! 달력과 작업을 이 계정에 추가(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메시지 %d개"
 
-#: ../modules/mail/e-mail-shell-backend.c:238
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "메일 메시지(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "메일 메시지를 새로 작성합니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "메일 계정(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail account"
 msgstr "새 메일 계정을 만듭니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:255
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:257
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:555
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: ../modules/mail/e-mail-shell-backend.c:564
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
-#: ../modules/mail/e-mail-shell-backend.c:573
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "메일 작성 기본 설정"
 
-#: ../modules/mail/e-mail-shell-backend.c:582
+#: ../modules/mail/e-mail-shell-backend.c:578
 msgid "Network Preferences"
 msgstr "네트워크 기본 설정"
 
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:883
+#: ../modules/mail/e-mail-shell-backend.c:867
 msgctxt "label"
 msgid "None"
 msgstr "없음"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:659
+msgid "Marking messages as read..."
+msgstr "메시지를 읽은 것으로 표시..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_Disable Account"
 msgstr "계정 사용 않기(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Disable this account"
 msgstr "이 계정을 사용하지 않습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1520
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "Edit properties of this account"
 msgstr "이 계정의 속성을 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1532
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1534
 msgid "Refresh list of folders of this account"
 msgstr "이 계정의 폴더 목록을 새로 고칩니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "_Download Messages for Offline Usage"
 msgstr "연결 중지 상태 용도로 메시지 다운로드(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "연결 중지 상태 사용으로 표시한 계정 및 폴더의 메시지를 다운로드합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1546
 msgid "Fl_ush Outbox"
 msgstr "보낼 편지함 플러시(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "_Copy Folder To..."
 msgstr "폴더 복사(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Copy the selected folder into another folder"
 msgstr "선택한 폴더를 다른 폴더로 복사합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Permanently remove this folder"
 msgstr "이 폴더를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "E_xpunge"
 msgstr "완전히 삭제(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "이 폴더의 삭제한 모든 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Mar_k All Messages as Read"
 msgstr "모든 메시지를 읽은 것으로 표시(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1676
 msgid "Mark all messages in the folder as read"
 msgstr "폴더의 모든 메시지를 읽은 것으로 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Move Folder To..."
 msgstr "폴더 옮기기(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Move the selected folder into another folder"
 msgstr "선택한 폴더를 다른 폴더로 옮깁니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "_New..."
 msgstr "새로 만들기(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Create a new folder for storing mail"
 msgstr "메일을 저장하는 새 폴더를 만듭니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Change the properties of this folder"
 msgstr "이 폴더의 속성을 바꿉니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Refresh the folder"
 msgstr "폴더를 새로 고침"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Change the name of this folder"
 msgstr "이 폴더의 이름을 바꿉니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Select Message _Thread"
 msgstr "메시지 글타래 선택(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "Select all messages in the same thread as the selected message"
 msgstr "선택한 메시지와 같은 글타래의 모든 메시지를 선택합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Select Message S_ubthread"
 msgstr "메시지 아래 글타래 선택(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Select all replies to the currently selected message"
-msgstr "현재 선택한 메시지의 회신을 모두 선택합니다"
+msgstr "현재 선택한 메시지의 답장을 모두 선택합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Empty _Trash"
 msgstr "지운 메시지 비우기(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "_New Label"
 msgstr "새 레이블(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "N_one"
 msgstr "없음(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "_Manage Subscriptions"
 msgstr "구독 관리(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1669
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "원격 서버의 폴더를 구독/구독해지 합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Send / _Receive"
 msgstr "보내고 받기(_R)"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "Send queued items and retrieve new items"
 msgstr "밀린 메일을 보내고 새 메일을 받습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "R_eceive All"
 msgstr "모두 받기(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Receive new items from all accounts"
 msgstr "모든 계정의 항목을 받습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "_Send All"
 msgstr "모두 보내기(_S)"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Send queued items in all accounts"
 msgstr "모든 계정의 밀린 항목을 보냅니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Cancel the current mail operation"
 msgstr "현재 메일 동작을 취소합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Collapse All _Threads"
 msgstr "모든 글타래 접기(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Collapse all message threads"
 msgstr "모든 메시지 글타래를 접습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "E_xpand All Threads"
 msgstr "모든 글타래 펼치기(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Expand all message threads"
 msgstr "모든 메시지 글타래의 지운 메시지를 비웁니다."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "_Message Filters"
 msgstr "메시지 필터(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Create or edit rules for filtering new mail"
 msgstr "새 메일 필터 규칙을 만들거나 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Subscriptions..."
 msgstr "구독(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "F_older"
 msgstr "폴더(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
 msgid "_Label"
 msgstr "레이블(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "C_reate Search Folder From Search..."
 msgstr "검색한 결과로 검색 폴더 만들기(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Search F_olders"
 msgstr "검색 폴더(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Create or edit search folder definitions"
 msgstr "검색 폴더 정의를 만들거나 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Show Message _Preview"
 msgstr "메시지 미리보기 보이기(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1862
 msgid "Show message preview pane"
 msgstr "메시지 보기 창을 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "Show _Deleted Messages"
 msgstr "삭제한 메시지 보이기(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1870
 msgid "Show deleted messages with a line through them"
 msgstr "삭제한 메시지를 선을 그어 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "_Group By Threads"
 msgstr "글타래로 묶음(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Threaded message list"
 msgstr "연관된 메시지 목록"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1884
 msgid "_Unmatched Folder Enabled"
 msgstr "해당 없음 폴더 사용(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1886
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "해당 없음 검색 폴더를 사용할지 여부를 토글합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1906
 msgid "Show message preview below the message list"
 msgstr "메시지 목록 아래에 메시지 미리 보기를 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1913
 msgid "Show message preview alongside the message list"
 msgstr "메시지 목록과 나란히 메시지 미리 보기를 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "All Messages"
 msgstr "모든 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1928
 msgid "Important Messages"
 msgstr "중요한 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1935
 msgid "Last 5 Days' Messages"
 msgstr "최근 5일간 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Messages Not Junk"
 msgstr "정크메일 아닌 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1949
 msgid "Messages with Attachments"
 msgstr "첨부가 있는 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1956
 msgid "No Label"
 msgstr "레이블 없음"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Read Messages"
 msgstr "읽은 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1970
 msgid "Unread Messages"
 msgstr "읽지 않은 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Subject or Addresses contain"
 msgstr "제목이나 주소에 포함"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "All Accounts"
 msgstr "모든 계정"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "Current Account"
 msgstr "현재 계정"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:2046
 msgid "Current Folder"
 msgstr "현재 폴더"
 
-#: ../modules/mail/e-mail-shell-view.c:616
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "모든 계정 검색"
 
-#: ../modules/mail/e-mail-shell-view.c:717
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "계정 검색"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d개 선택, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d개 삭제"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d개 정크"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d개 임시"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d개 안 보냄"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d개 보냄"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d개 안 읽음, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1102
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 msgid "Trash"
 msgstr "지운 메시지"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1522
 msgid "Send / Receive"
 msgstr "보내기 / 받기"
 
-#: ../modules/mail/em-composer-prefs.c:492
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "언어"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, every time"
 msgstr "나갈 때, 항상"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per day"
 msgstr "나갈 때, 하루에 한번"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per week"
 msgstr "나갈 때, 한주에 한번"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "On exit, once per month"
 msgstr "나갈 때, 한달에 한번"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:85
 msgid "Immediately, on folder leave"
 msgstr "즉시, 폴더 나갈 때"
 
-#: ../modules/mail/em-mailer-prefs.c:313
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "헤더"
 
-#: ../modules/mail/em-mailer-prefs.c:317
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "값 포함"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "날짜 헤더(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "원본 헤더 값 표시(_O)"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "에볼루션을 기본 전자메일 프로그램으로 하시겠습니까?"
 
@@ -18558,13 +18626,13 @@ msgstr "%s에게 보낸 \"%s\"에 관한(보낸 때 %s) 메시지를 읽었습
 msgid "Delivery Notification for \"%s\""
 msgstr "다음 메일에 대한 배달 확인: \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "다음에 메시지 수신 확인 보내기: '%s'"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:541
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "배달 확인 보내기(_N)"
 
@@ -18594,24 +18662,6 @@ msgid ""
 "established."
 msgstr "네트워크가 연결되면 에볼루션은 연결 상태로 되돌아갑니다."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:298
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"인증 토큰을 얻을 org.gnome.OnlineAccounts 서비스의 계정을 찾을 수 없습니다."
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:380
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:382
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-"이 옵션은 그놈 온라인 계정 서비스에 연결하는 방법으로 서버에 연결합니다"
-
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "개발자"
@@ -18718,41 +18768,41 @@ msgstr "일반 텍스트 모드"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "메일 메시지에 HTML이 있더라도 일반 텍스트로 봅니다."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:184
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "스팸어새신을 시작하는데 실패했습니다 (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:207
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "메일 메시지 내용을 스팸어새신에 전달하는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:226
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "스팸어새신에 '%s' 데이터를 쓰는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:254
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr "스팸어새신에서 출력을 읽는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:309
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "스팸어새신이 이상 종료했거나 메일 메시지를 처리하는데 실패했습니다"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:747
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "스팸어새신 옵션"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:762
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "원격 테스트 포함(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:776
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "이렇게 하면 스팸어새신이 더 안정적으로 작동하지만, 더 느립니다."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1033
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "스팸어새신"
 
@@ -18781,9 +18831,10 @@ msgid ""
 msgstr ""
 "에볼루션을 사용하게 되신 것을 환영합니다.\n"
 "\n"
-"다음에 올 몇 개의 화면에서 에볼루션으로 전자메일 계정에 연결하도록 설정하고, 다른 프로그램에서 쓰던 파일을 가져오게 됩니다."
+"다음에 올 몇 개의 화면에서 에볼루션으로 전자메일 계정에 연결하도록 설정하고, "
+"다른 프로그램에서 쓰던 파일을 가져오게 됩니다."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:239
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "계정 읽어들이는 중..."
 
@@ -18795,11 +18846,11 @@ msgstr "지정한 형식으로 표시(_F)..."
 msgid "_Other languages"
 msgstr "다른 언어(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
 msgid "Text Highlight"
 msgstr "텍스트 강조"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
 msgid "Syntax highlighting of mail parts"
 msgstr "메일 부분의 텍스트 강조"
 
@@ -19019,35 +19070,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "전체 vCard 표시(_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "간단히 vCard 표시(_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "주소록에 저장(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "기타 연락처가 한 개 있습니다."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "기타 연락처가 %d개 있습니다."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 msgid "Addressbook Contact"
 msgstr "주소록 연락처"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr "이 부분을 주소록 연락처로 표시"
 
@@ -19060,7 +19111,7 @@ msgid "_Do not show this message again."
 msgstr "이 메시지를 다시 보지 않기(_D)."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:473
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "키워드"
 
@@ -19092,26 +19143,26 @@ msgstr "첨부 알림"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "메일 메시지에 첨부 추가를 잊었을 때 알립니다."
 
-#: ../plugins/bbdb/bbdb.c:633 ../plugins/bbdb/bbdb.c:642
+#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "자동 연락처"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:657
+#: ../plugins/bbdb/bbdb.c:659
 msgid "Create _address book entries when sending mails"
 msgstr "메일을 보낼 때 주소록에 항목 만들기(_A)"
 
-#: ../plugins/bbdb/bbdb.c:665
+#: ../plugins/bbdb/bbdb.c:666
 msgid "Select Address book for Automatic Contacts"
 msgstr "자동 연락처를 사용할 주소록을 선택하십시오"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:683
 msgid "Instant Messaging Contacts"
 msgstr "인스턴스 메시지 연락처"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:697
+#: ../plugins/bbdb/bbdb.c:698
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "피진 친구 목록의 연락처 정보 및 그림을 동기화(_S)"
 
@@ -19138,7 +19189,7 @@ msgid ""
 msgstr ""
 "주소록 관리 단순 작업을 수행합니다.\n"
 "\n"
-"메시지에 회신할 때마다 자동으로 이름과 전자메일 주소를 주소록에 넣습니다. 또 "
+"메시지에 답장할 때마다 자동으로 이름과 전자메일 주소를 주소록에 넣습니다. 또 "
 "친구 목록에서 인스턴스 메시지 연락처 정보를 채워 넣습니다."
 
 #: ../plugins/dbx-import/dbx-importer.c:282
@@ -19222,7 +19273,7 @@ msgid "Key"
 msgstr "키"
 
 #: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:482
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "값"
 
@@ -19251,6 +19302,10 @@ msgstr ""
 "엑스이맥스의 경우 \"xemacs\"를 사용하고\n"
 "Vim은 \"gvim -f\"를 사용하십시오"
 
+#: ../plugins/external-editor/external-editor.c:123
+msgid "_Automatically launch when a new mail is edited"
+msgstr "새 메일을 편집할 때 자동으로 실행(_A)"
+
 #: ../plugins/external-editor/external-editor.c:413
 #: ../plugins/external-editor/external-editor.c:415
 msgid "Compose in External Editor"
@@ -19358,55 +19413,55 @@ msgstr "내장 그림"
 msgid "View image attachments directly in mail messages."
 msgstr "그림을 메일 메시지에서 직접 표시합니다."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "리스트 아카이브 받기(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 msgid "Get an archive of the list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트의 아카이브를 받습니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "리스트 사용 정보 받기(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트의 사용방법 정보를 받습니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "리스트 담당자에게 연락(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트의 소유자에게 연락합니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "리스트에 메시지 보내기(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트에 메시지를 게시합니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "_Subscribe to List"
 msgstr "리스트에 가입(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트에 가입합니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "_Unsubscribe from List"
 msgstr "리스트에서 탈퇴(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "이 메시지가 속한 메일링 리스트에서 탈퇴합니다"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
 msgid "Mailing _List"
 msgstr "메일링 리스트(_L)"
 
@@ -19436,7 +19491,9 @@ msgstr "게시할 권한이 없습니다"
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr "이 메일링 리스트에는 메일을 쓸 수 없습니다. 쓰기 전용 메일링 리스트로 보입니다. 자세한 건 리스트 주인에게 물어보십시오."
+msgstr ""
+"이 메일링 리스트에는 메일을 쓸 수 없습니다. 쓰기 전용 메일링 리스트로 보입니"
+"다. 자세한 건 리스트 주인에게 물어보십시오."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
@@ -19500,6 +19557,13 @@ msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "새로 메시지 %d개를 받았습니다."
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "보낸 사람: %s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:409
@@ -19555,12 +19619,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "새 메시지가 도착하면 알립니다."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:233
+#: ../plugins/mail-to-task/mail-to-task.c:232
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s 메일에서 만들어짐"
 
-#: ../plugins/mail-to-task/mail-to-task.c:617
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19568,7 +19632,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 행사가 들어 있습니다. 예전 행사를 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:620
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19576,7 +19640,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 작업이 들어 있습니다. 예전 작업을 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19584,7 +19648,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 메모가 들어 있습니다. 예전 메모를 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19595,7 +19659,7 @@ msgid_plural ""
 msgstr[0] ""
 "행사로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:650
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19606,7 +19670,7 @@ msgid_plural ""
 msgstr[0] ""
 "작업으로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:657
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19617,79 +19681,85 @@ msgid_plural ""
 msgstr[0] ""
 "쪽지로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:678
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "나머지 메일의 변환을 계속 하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:754
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[요약 없음]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:767
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "서버에서 올바르지 않은 오브젝트를 받았습니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "처리 중 오류가 발생했습니다: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:855
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "달력을 열 수 없습니다. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:862
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
-msgstr "선택한 달력이 읽기 전용이라서 여기에 행사를 만들 수 없습니다. 다른 달력을 선택하십시오."
+msgstr ""
+"선택한 달력이 읽기 전용이라서 여기에 행사를 만들 수 없습니다. 다른 달력을 선"
+"택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:865
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
-msgstr "선택한 작업 목록이 읽기 전용이라서 여기에 작업을 만들 수 없습니다. 다른 작업 목록을 선택하십시오."
+msgstr ""
+"선택한 작업 목록이 읽기 전용이라서 여기에 작업을 만들 수 없습니다. 다른 작업 "
+"목록을 선택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:865
+#: ../plugins/mail-to-task/mail-to-task.c:868
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
-msgstr "선택한 메모 목록이 읽기 전용이라서 여기에 메모를 만들 수 없습니다. 다른 메모 목록을 선택하십시오."
+msgstr ""
+"선택한 메모 목록이 읽기 전용이라서 여기에 메모를 만들 수 없습니다. 다른 메모 "
+"목록을 선택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1199
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "No writable calendar is available."
 msgstr "쓰기 가능한 달력이 없습니다."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create an _Appointment"
 msgstr "약속 만들기(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new event from the selected message"
 msgstr "선택한 메시지에서 새 행사를 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a Mem_o"
 msgstr "메모 만들기(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new memo from the selected message"
 msgstr "선택한 메시지에서 새 메모를 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1291
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Task"
 msgstr "작업 만들기(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new task from the selected message"
 msgstr "선택한 메시지에서 새 작업을 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1301
+#: ../plugins/mail-to-task/mail-to-task.c:1304
 msgid "Create a _Meeting"
 msgstr "모임 만들기(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1303
+#: ../plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a new meeting from the selected message"
 msgstr "선택한 메시지에서 새 모임을 만듭니다"
 
@@ -19697,38 +19767,6 @@ msgstr "선택한 메시지에서 새 모임을 만듭니다"
 msgid "Convert a mail message to a task."
 msgstr "메일 메시지를 작업으로 바꿉니다."
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr "아래 폴더의 메시지도 표시하시겠습니까?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"현재 폴더만 읽은 메시지로 표시하시겠습니까? 아니면 현재 폴더와 그 아래 폴더"
-"의 모든 메시지를 모두 읽은 메시지로 표시하시겠습니까?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:184
-msgid "In Current Folder and _Subfolders"
-msgstr "현재 폴더 및 하위 폴더에서(_S)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:198
-msgid "In Current _Folder Only"
-msgstr "현재 폴더에서만(_F)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:544
-msgid "Mark Me_ssages as Read"
-msgstr "메시지를 읽은 것으로 표시(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "모두 읽은 것으로 표시"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "폴더의 모든 메시지를 읽은 것으로 표시합니다."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "아웃룩 PST 가져오기"
@@ -19741,38 +19779,38 @@ msgstr "아웃룩 개인 폴더 (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "PST 파일의 아웃룩 메시지를 가져옵니다"
 
-#: ../plugins/pst-import/pst-importer.c:527
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "메일(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:556
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "대상 폴더:"
 
-#: ../plugins/pst-import/pst-importer.c:566
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "주소록(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "약속(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:576 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "작업(_T)"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "_Journal entries"
 msgstr "일지 항목(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../plugins/pst-import/pst-importer.c:701
 msgid "Importing Outlook data"
 msgstr "아웃룩 데이터 가져오기"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:142
-#: ../plugins/publish-calendar/publish-calendar.c:149
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "달력 게시"
 
@@ -19784,49 +19822,44 @@ msgstr "위치"
 msgid "Publish calendars to the web."
 msgstr "달력을 웹에 게시합니다."
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
-#: ../plugins/publish-calendar/publish-calendar.c:472
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "'%s'을(를) 열 수 없습니다:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "'%s'을(를) 열 수 없습니다: 알 수 없는 오류가 발생했습니다"
-
 #: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "'%s'에 게시하는데 오류가 발생했습니다:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "'%s'에 성공적으로 게시를 마쳤습니다"
 
-#: ../plugins/publish-calendar/publish-calendar.c:282
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "'%s'의 마운트가 실패했습니다:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:649
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "사용(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:785
+#: ../plugins/publish-calendar/publish-calendar.c:799
 msgid "Are you sure you want to remove this location?"
 msgstr "정말로 이 위치를 제거하시겠습니까?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1124
+#: ../plugins/publish-calendar/publish-calendar.c:1138
 msgid "Could not create publish thread."
 msgstr "글타래를 게시할 수 없습니다."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1134
+#: ../plugins/publish-calendar/publish-calendar.c:1148
 msgid "_Publish Calendar Information"
 msgstr "달력 정보 게시(_P)"
 
@@ -19921,7 +19954,7 @@ msgid "Publishing Location"
 msgstr "게시 위치"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:98
+#: ../plugins/publish-calendar/publish-format-ical.c:103
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "잘못된 소스 UID '%s'"
@@ -19990,31 +20023,31 @@ msgstr "참석자 목록"
 msgid "Modified"
 msgstr "바뀜"
 
-#: ../plugins/save-calendar/csv-format.c:566
+#: ../plugins/save-calendar/csv-format.c:564
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV 형식의 고급 옵션(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Prepend a _header"
 msgstr "앞에 헤더 붙임(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:583
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "_Value delimiter:"
 msgstr "값 구분(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:594
+#: ../plugins/save-calendar/csv-format.c:592
 msgid "_Record delimiter:"
 msgstr "레코드 구분(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:605
+#: ../plugins/save-calendar/csv-format.c:603
 msgid "_Encapsulate values with:"
 msgstr "값을 둘러싸는 문자(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:631
+#: ../plugins/save-calendar/csv-format.c:629
 msgid "Comma separated values (.csv)"
 msgstr "콤마로 구분한 값 (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20035,7 +20068,7 @@ msgstr "달력이나 작업 목록을 디스크에 저장합니다."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:386
+#: ../plugins/save-calendar/rdf-format.c:385
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -20069,43 +20102,43 @@ msgstr ""
 "[body] 따위의 변수를 이용합니다. 이 변수는 답장하는 메일 값에 들어 있는 값으"
 "로 바뀝니다."
 
-#: ../plugins/templates/templates.c:1135
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "제목 없음"
 
-#: ../plugins/templates/templates.c:1244
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "서식으로 저장(_T)"
 
-#: ../plugins/templates/templates.c:1246
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "서식으로 저장"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:307
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "연결 중지 상태로 이동하는 준비 중..."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:360
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "연결 상태로 이동하는 준비 중..."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:434
+#: ../shell/e-shell.c:412
 msgid "Preparing to quit"
 msgstr "끝낼 준비 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:440
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "끝낼 준비 중..."
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
 msgid "Searches"
 msgstr "검색"
 
-#: ../shell/e-shell-content.c:764
+#: ../shell/e-shell-content.c:765
 msgid "Save Search"
 msgstr "검색 저장"
 
@@ -20113,32 +20146,32 @@ msgstr "검색 저장"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1143
+#: ../shell/e-shell-searchbar.c:1102
 msgid "Sho_w:"
 msgstr "보기(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1186
+#: ../shell/e-shell-searchbar.c:1136
 msgid "Sear_ch:"
 msgstr "검색(_C):"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1272
+#: ../shell/e-shell-searchbar.c:1217
 msgid "i_n"
 msgstr " 위치(_N)"
 
-#: ../shell/e-shell-utils.c:195
+#: ../shell/e-shell-utils.c:175
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:199
 msgid "All Files (*)"
 msgstr "모든 파일 (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "사용자 인터페이스 상태 저장"
 
@@ -20153,301 +20186,301 @@ msgstr "GNOME Korea <gnome-kr googlegroups com>"
 msgid "Evolution Website"
 msgstr "에볼루션 웹사이트"
 
-#: ../shell/e-shell-window-actions.c:323
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
 msgstr "분류 편집"
 
-#: ../shell/e-shell-window-actions.c:660
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "버그버디를 설치하지 않았습니다."
 
-#: ../shell/e-shell-window-actions.c:661
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "버그버디를 실행할 수 없습니다."
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "에볼루션에 대한 정보를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "창 닫기(_C)"
 
-#: ../shell/e-shell-window-actions.c:867
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "차례(_C)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:869
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "에볼루션 사용자 안내서를 엽니다"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "가져오기(_M)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "다른 프로그램에서 데이터를 가져옵니다"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "새 창(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "이 뷰를 새 창을 만듭니다"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
 msgstr "사용 가능한 분류(_G)"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
 msgstr "사용 가능한 분류를 관리합니다"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "짧은 참조 문서(_Q)"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "에볼루션 바로 가기 키를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:939
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "프로그램을 끝냅니다"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "고급 검색(_A)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "더 복잡한 고급 검색을 수행합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
 msgstr "현재 검색 파라미터를 지웁니다"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "저장한 검색 편집(_E)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "저장한 검색을 관리합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:967
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "검색 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
 # tooltip
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "현재 검색 파라미터를 실행합니다"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "검색 저장(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:981
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "현재 검색 파라미터를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "버그 제보(_B)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "버그버디로 버그제보를 합니다"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "연결 중지 상태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "에볼루션을 연결 중지 상태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "연결 상태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "에볼루션을 연결 상태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "배치(_O)"
 
-#: ../shell/e-shell-window-actions.c:1044
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "검색(_S)"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "전환 단추 모양(_S)"
 
-#: ../shell/e-shell-window-actions.c:1072
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "창(_W)"
 
-#: ../shell/e-shell-window-actions.c:1101
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "보조 모음 보이기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1103
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "보조 모음을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1109
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "단추 보이기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1111
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "전환 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1117
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "상태 표시줄 보기(_S)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1119
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "상태 표시줄을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1125
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "도구 모음 보이기(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "도구 모음을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1149
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "아이콘만(_I)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1151
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "아이콘만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "텍스트만(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "텍스트만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "아이콘 및 텍스트(_A)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "아이콘과 텍스트를 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "도구 모음 모양(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "데스크톱 도구 모음 설정을 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1180
-msgid "Define Views..."
-msgstr "보기 지정..."
+#: ../shell/e-shell-window-actions.c:1192
+msgid "Delete Current View"
+msgstr "현재 뷰 삭제"
 
-# tooltip
-#: ../shell/e-shell-window-actions.c:1182
-msgid "Create or edit views"
-msgstr "보기를 만들거나 편집합니다"
-
-#: ../shell/e-shell-window-actions.c:1187
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "사용자 보기 저장..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1189
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "현재 사용자 정의 뷰를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:1196
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "현재 보기(_U)"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "사용자 보기"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "현재 뷰는 사용자 정의 뷰입니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "현재 프린터의 페이지 설정을 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1714
 #, c-format
 msgid "Select view: %s"
 msgstr "뷰 선택: %s"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1731
+#, c-format
+msgid "Delete view: %s"
+msgstr "뷰 삭제: %s"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "이 검색 파라미터를 실행합니다"
 
-#: ../shell/e-shell-window.c:497
+#: ../shell/e-shell-window.c:455
 msgid "New"
 msgstr "새로 만들기"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 에볼루션"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20466,10 +20499,12 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"안녕하십니까.  에볼루션 그룹웨어 모음의 프리뷰 릴리스를 받는데 귀중한 시간을\n"
+"안녕하십니까.  에볼루션 그룹웨어 모음의 프리뷰 릴리스를 받는데 귀중한 시간"
+"을\n"
 "내 주셔서 감사합니다.\n"
 "\n"
-"이 버전의 에볼루션은 아직 완성되지 않았습니다. 거의 완성되었지만, 몇몇 기능이\n"
+"이 버전의 에볼루션은 아직 완성되지 않았습니다. 거의 완성되었지만, 몇몇 기능"
+"이\n"
 "다 안 되어 있고, 제대로 동작하지 않는 것도 있습니다.\n"
 "\n"
 "안정 버전의 에볼루션을 쓰시려면, 이 버전을 지우시고, %s 버전을 사용하시길\n"
@@ -20481,7 +20516,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
 "주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20489,13 +20524,13 @@ msgstr ""
 "고맙습니다\n"
 "에볼루션 팀\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:303
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20503,54 +20538,52 @@ msgstr ""
 "에볼루션을 시작할 때 지정한 컴포넌트를 표시, 사용 가능한 항목은 'mail', "
 "'calendar', 'contacts', 'tasks', 'memos'"
 
-#: ../shell/main.c:307
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "해당 크기와 위치를 메인 창에 적용합니다"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "연결 상태에서 시작합니다"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "네트워크 사용 가능 여부를 무시합니다"
 
 #: ../shell/main.c:315
-msgid "Start in \"express\" mode"
-msgstr "\"고속\" 모드에서 시작합니다"
-
-#: ../shell/main.c:318
 msgid "Forcibly shut down Evolution"
 msgstr "강제로 에볼루션을 끝냅니다"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "플러그인을 아무것도 읽어들이지 않습니다."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전자메일, 연락처, 작업의 미리 보기 창을 사용하지 않습니다."
 
-#: ../shell/main.c:327
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "뒤의 인자에 쓴 URI와 파일 이름을 가져옵니다."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "실행 중인 에볼루션 프로세스에 끝내는 요청을 합니다"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
-msgstr "에볼루션을 시작할 수 없습니다. 다른 에볼루션 인스턴스가 응답이 없어 보입니다. 시스템 오류: %s"
+msgstr ""
+"에볼루션을 시작할 수 없습니다. 다른 에볼루션 인스턴스가 응답이 없어 보입니"
+"다. 시스템 오류: %s"
 
-#: ../shell/main.c:515 ../shell/main.c:520
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- 에볼루션 개인정보 관리 및 메일 클라이언트"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20559,7 +20592,7 @@ msgstr ""
 "%s: --online과 --offline 옵션은 같이 쓸 수 없습니다\n"
 "  자세한 정보를 보려면 '%s --help' 명령을 실행하십시오.\n"
 
-#: ../shell/main.c:593
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20799,21 +20832,24 @@ msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
-msgstr ""
-"이 인증서를 발급한 인증 기관을 신뢰하지 않는다고 하셨으므로, 따로 지정하지 않"
-"는 한 이 인증서를 믿을만 하다고 신뢰하지 않습니다."
+msgstr "이 인증서를 발급한 인증 기관을 신뢰하지 않는다고 하셨으므로, 따로 지정하지 않는 한 이 인증서를 믿을만하다고 신뢰하지 않습니다."
+
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "'%s'(토큰 '%s')의 암호를 입력하십시오"
 
-#: ../smime/gui/component.c:51
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "'%s'의 암호를 입력하십시오"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "인증서 데이터베이스의 새 암호를 입력하십시오"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "새 암호를 입력하십시오"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]