[evolution/wip/webkit2] Updated Korean translation



commit 3aa965d66b169c4647601da222c390f171e4e73c
Author: Changwoo Ryu <cwryu debian org>
Date:   Sun Mar 8 01:38:28 2015 +0900

    Updated Korean translation

 po/ko.po |10853 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 6718 insertions(+), 4135 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index 9ba78ff..be7e613 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 # ChiDeok Hwang <hwang mizi co kr>, 2001.
 # Young-Ho Cha <ganadist mizi com>, 2000, 2002.
 # Eunju Kim <eukim redhat com>, 2007.
-# Changwoo Ryu <cwryu debian org>, 2003-2014.
+# Changwoo Ryu <cwryu debian org>, 2003-2015.
 #
 # 참고:
 # - 이 프로그램의 이름인 Evolution은 "에볼루션"으로 음역.
@@ -42,14 +42,14 @@
 #   - day view -> 일별 보기
 #   - work week view -> 근무일 주별 보기
 #   - date navigator -> 날짜 선택 달력
-#: ../shell/main.c:554
+#: ../shell/main.c:506
 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: 2014-03-06 05:30+0000\n"
-"PO-Revision-Date: 2014-03-07 00:04+0900\n"
+"POT-Creation-Date: 2015-03-07 05:19+0000\n"
+"PO-Revision-Date: 2015-03-08 01:19+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
 "Language: Korean\n"
@@ -156,24 +156,28 @@ msgid "Unable to perform search."
 msgstr "검색을 수행할 수 없습니다."
 
 #: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "'{0}' 주소록을 새로 고치는데 실패했습니다"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "이 연락처에 바뀐 부분이 있습니다. 바뀐 사항을 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "버리기(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "연락처를 옮길 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -181,36 +185,36 @@ msgstr ""
 "연락처를 한 주소록에서 다른 주소록으로 옮기려고 하지만 원래 주소록에서 연락처"
 "를 지울 수 없습니다. 옮기는 대신에 복사하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr "선택한 그림 크기가 큽니다. 크기를 조정해서 저장하시겠습니까?"
+msgstr "선택한 이미지 크기가 큽니다. 크기를 조정해서 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "크기 조정(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "그대로 사용(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "저장하지 않기(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0}을(를) 저장할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0}을(를) {1}에 저장하는데 오류가 발생했습니다: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "'{0}' 주소가 이미 있습니다."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -218,30 +222,30 @@ msgstr ""
 "이 주소가 들어 있는 연락처가 이미 있습니다. 그래도 같은 주소의 카드를 새로 만"
 "드시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:397
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "추가(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "연락처 목록에 이미 들어 있는 주소가 있습니다."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -249,19 +253,19 @@ msgstr ""
 "추가하려는 연락처 중에 이미 목록에 있는 연락처가 있습니다. 그래도 추가하시겠"
 "습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "중복 무시"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "중복된 추가"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "'{0}' 목록이 이미 연락처 목록에 들어 있습니다."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -269,21 +273,21 @@ msgstr ""
 "이름이 '{0}'인 연락처 목록이 이미 이 연락처 목록에 들어 있습니다. 그래도 추가"
 "하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "연락처를 삭제하는데 실패했습니다"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "이 주소록의 연락처를 지울 권한이 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "새로운 연락처를 추가할 수 없습니다"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -291,27 +295,29 @@ msgstr ""
 "'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 가장자리 창의 연락"
 "처 보기에서 다른 주소록을 선택하십시오."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "연락처를 저장할 수 없습니다. 주소록이 이미 열려 있습니다."
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
-msgstr "연락처를 '{0}' 주소록에 저장할 수 없습니다. 주소록이 이미 열려 있습니다. 열려 있는 주소록이 닫힐 때까지 기다리거나, 다른 주소록을 선택하십시오."
+msgstr ""
+"연락처를 '{0}' 주소록에 저장할 수 없습니다. 주소록이 이미 열려 있습니다. 열"
+"려 있는 주소록이 닫힐 때까지 기다리거나, 다른 주소록을 선택하십시오."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 msgid "Image"
-msgstr "그림"
+msgstr "이미지"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
 msgid "Nic_kname:"
@@ -338,83 +344,82 @@ msgid "Full _Name..."
 msgstr "전체 이름(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "HTML 메일 받음(_W)"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:589
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
 msgid "Email"
 msgstr "전자메일"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "HTML 메일 받음(_W)"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "전화"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "SIP 주소"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "인스턴스 메시징"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "연락처"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "홈페이지(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Calendar:"
 msgstr "달력(_C):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "약속 있음/없음(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "화상 대화(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "홈페이지:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "달력:"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "약속 있음/없음:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "화상 대화:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "블로그(_B):"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "블로그:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "웹 주소"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "웹 주소"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -463,8 +468,8 @@ msgid "_Anniversary:"
 msgstr "기념일(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2277
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "기념일"
 
@@ -474,8 +479,8 @@ 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:684
-#: ../calendar/gui/e-calendar-view.c:2276 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "생일"
 
@@ -508,32 +513,30 @@ msgid "_PO Box:"
 msgstr "사서함(_P):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "주소(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "집"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "업무"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "기타"
 
@@ -546,167 +549,188 @@ msgid "Notes"
 msgstr "쪽지"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1041
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "도움말(_H)"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
+msgid "Options"
+msgstr "옵션"
+
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:621
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
-#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
-#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:484 ../e-util/e-html-editor-actions.c:578
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3088 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3131
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:900
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:363
+#: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/face/face.c:291
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3132
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "Show Telephone"
+msgstr "전화 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
-msgid "Jabber"
-msgstr "재버"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+msgid "Show SIP Address"
+msgstr "SIP 주소 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
-msgid "Yahoo"
-msgstr "야후"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+msgid "Show Instant Messaging"
+msgstr "인스턴스 메시징 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Gadu-Gadu"
-msgstr "가두가두"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+msgid "Show Web Addresses"
+msgstr "웹 주소 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+msgid "Show Job section"
+msgstr "직업 부분 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+msgid "Show Miscellaneous"
+msgstr "기타 내용 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
-msgid "GroupWise"
-msgstr "그룹와이즈"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Home Mailing Address"
+msgstr "집 주소 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "Skype"
-msgstr "스카이프"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show Work Mailing Address"
+msgstr "직장 주소 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "Twitter"
-msgstr "트위터"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Other Mailing Address"
+msgstr "기타 주소 표시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Notes"
+msgstr "메모 표시"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:999
+msgid "_Undo"
+msgstr "실행 취소(_U)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "실행 취소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:985
+msgid "_Redo"
+msgstr "다시 실행(_R)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "다시 실행"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "연락처를 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "연락처를 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "연락처를 제거하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연락처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
-msgstr "이 연락처에 사용할 그림을 선택하십시오"
+msgstr "이 연락처에 사용할 이미지를 선택하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
-#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:485 ../e-util/e-html-editor-actions.c:579
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
-msgstr "그림 없음(_N)"
+msgstr "이미지 없음(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -714,28 +738,28 @@ msgstr ""
 "연락처 데이터가 잘못되었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' 형식은 미래가 되면 안 됩니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'이(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "연락처가 잘못되었습니다."
 
@@ -747,23 +771,24 @@ msgstr "연락처가 잘못되었습니다."
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 #: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
-#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
-#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
-#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
-#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:381 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "확인(_O)"
 
@@ -775,15 +800,15 @@ msgstr "연락처 빠른 추가"
 msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "전체 이름(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "전자 메일(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "주소록 선택(_S)"
 
@@ -892,14 +917,13 @@ msgstr "전자메일 주소를 목록에서 제거합니다"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:52
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
@@ -938,41 +962,260 @@ msgstr "맨 아래(_B)"
 msgid "Contact List Members"
 msgstr "연락처 목록 구성원"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "구성원(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "목록을 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "목록을 수정하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "목록을 제거하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+# 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:1195
+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:1188
+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:1181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "필드에 포함"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "에볼루션 주소록"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "전자메일 주소 복사(_E)"
+
+# tooltip
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "전자메일 주소를 클립보드로 복사합니다"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "새 메시지 보내기(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "전자메일 메시지를 이 주소로 보냅니다"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:999
+#, c-format
+msgid "Click to mail %s"
+msgstr "메일을 %s 주소로 보내려면 누르십시오"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "지도 열기"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+# List는 여기서 Mailing List를 말한다
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "리스트 구성원:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "별명"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "그룹와이즈"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "재버"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "야후"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "가두가두"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "스카이프"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "트위터"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "회사"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "부서"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "사무실"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "업무"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "직위"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "관리자"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "비서"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "화상 대화"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "달력"
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "약속 있음/없음"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "전화"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "팩스"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "주소"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "홈페이지"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "웹로그"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "휴대 전화"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "배우자"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "개인"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "메모"
+
+# List는 여기서 Mailing List를 말한다
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "리스트 구성원"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "직위"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "홈페이지"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "블로그"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "취소함"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "연락처 합치기"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "합치기(_M)"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "중복되는 연락처를 찾았습니다"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -980,7 +1223,7 @@ msgstr ""
 "이 연락처의 이름이나 메일 주소가 이미 이 폴더에 들어 있습니다.\n"
 "그래도 바뀐 사항을 저장하시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -988,43 +1231,134 @@ msgstr ""
 "이 폴더에 이 연락처와 같은 이름이나 같은 메일 주소가 이미 들어 있습니다.\n"
 "그래도 연락처를 추가하시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "바뀐 연락처:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "새 연락처:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "충돌하는 연락처:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old 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:1150
-msgid "Name contains"
-msgstr "이름에 포함"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+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 "
+"load the address book once in online mode to download its contents."
+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:1143
-msgid "Email begins with"
-msgstr "메일 주소 시작"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
+"는지 확인하십시오."
 
-#: ../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:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "필드에 포함"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+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."
+msgstr ""
+"이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP을 사용하려"
+"면 LDAP을 지원하는 에볼루션을 설치해야 합니다."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
+"없습니다."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "자세한 오류 메시지:"
+
+#: ../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"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"이 쿼리에 서버에서 리턴하기로 설정한 것보다 많은 카드가 일치하거나,\n"
+"에볼루션에서 표시하도록 설정한 것보다 많은 카드가 일치하였습니다.\n"
+"좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서 \n"
+"결과의 한계치를 지정하십시오."
+
+#: ../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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"쿼리에 걸린 시간이 서버의 시간 제한이나 이 주소록에서 설정한 시간 제한을\n"
+"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서\n"
+"시간 제한을 늘려 보십시오."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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: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: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:265
+msgid "card.vcf"
+msgstr "카드.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "주소록 선택"
+
+# 파일 이름
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "목록"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "연락처 이동"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "연락처 복사"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "연락처 이동"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "연락처 복사"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1062,7 +1396,7 @@ msgstr "클립보드에서 연락처를 붙여 넣습니다"
 
 # tooltip
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "선택한 연락처를 삭제합니다"
 
@@ -1097,16 +1431,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "정말로 연락처를 (%s) 삭제하시겠습니까?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:899 ../smime/gui/smime-ui.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "삭제(_D)"
 
@@ -1143,11 +1477,6 @@ msgstr "이름"
 msgid "Family Name"
 msgstr "성"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:591
-msgid "Nickname"
-msgstr "별명"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "전자메일 2"
@@ -1200,11 +1529,6 @@ msgstr "집 팩스"
 msgid "ISDN Phone"
 msgstr "ISDN 전화"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
-msgid "Mobile Phone"
-msgstr "휴대 전화"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "기타 전화"
@@ -1239,21 +1563,11 @@ msgstr "텔렉스"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:644
-msgid "Company"
-msgstr "회사"
-
 # FIXME - 조직 내의 구성, 부서 따위를 나타내는 말인 듯..  적당한 말을 찾아보자.
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "구성 단위"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
-msgid "Office"
-msgstr "사무실"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "직위"
@@ -1264,16 +1578,6 @@ msgstr "직위"
 msgid "Role"
 msgstr "역할"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../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:650
-msgid "Assistant"
-msgstr "비서"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "웹 사이트"
@@ -1291,34 +1595,56 @@ msgstr "일지"
 msgid "Categories"
 msgstr "분류"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Spouse"
-msgstr "배우자"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "열기"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-msgid "Note"
-msgstr "메모"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "연락처 목록: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "연락처: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "에볼루션 미니카드"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "새 연락처"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "새 연락처 목록"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "현재 주소록 폴더 %s에 카드 %d개가 들어 있습니다"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "연락처 지도"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "확대(_I)"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2360
 msgid "Zoom _Out"
 msgstr "축소(_O)"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:976
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "찾기(_F)"
 
@@ -1380,286 +1706,12 @@ msgstr ""
 "\n"
 "여기에서 볼 수 있는 항목이 없습니다."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "업무 전자메일"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "집 전자메일"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "기타 전자메일"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "에볼루션 주소록"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "새 연락처"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "새 연락처 목록"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "현재 주소록 폴더 %s에 카드 %d개가 들어 있습니다"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "열기"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "연락처 목록: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "연락처: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "에볼루션 미니카드"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "전자메일 주소 복사(_E)"
-
-# tooltip
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-msgid "Copy the email address to the clipboard"
-msgstr "전자메일 주소를 클립보드로 복사합니다"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
-msgid "_Send New Message To..."
-msgstr "새 메시지 보내기(_S)..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
-msgid "Send a mail message to this address"
-msgstr "전자메일 메시지를 이 주소로 보냅니다"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
-#, c-format
-msgid "Click to mail %s"
-msgstr "메일을 %s 주소로 보내려면 누르십시오"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "지도 열기"
-
-# List는 여기서 Mailing List를 말한다
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:528
-msgid "List Members:"
-msgstr "리스트 구성원:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
-msgid "Department"
-msgstr "부서"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
-msgid "Profession"
-msgstr "업무"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
-msgid "Position"
-msgstr "직위"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Video Chat"
-msgstr "화상 대화"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:545
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "달력"
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "약속 있음/없음"
-
-#: ../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:655
-msgid "Fax"
-msgstr "팩스"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-msgid "Address"
-msgstr "주소"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-msgid "Home Page"
-msgstr "홈페이지"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-msgid "Web Log"
-msgstr "웹로그"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
-msgid "Personal"
-msgstr "개인"
-
-# List는 여기서 Mailing List를 말한다
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
-msgid "List Members"
-msgstr "리스트 구성원"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
-msgid "Job Title"
-msgstr "직위"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
-msgid "Home page"
-msgstr "홈페이지"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
-msgid "Blog"
-msgstr "블로그"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-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 "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"이 주소록을 열 수 없습니다. 이 주소록을 연결 중지 상태에서 사용할 수 있게 표"
-"시하지 않았거나 아직 연결 중지 상태에서 사용할 수 있게 다운로드하지 않은 상태"
-"입니다. 연결 상태 모드에서 주소록을 다시 읽어들여서 그 내용을 다운로드하십시"
-"오."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
-"는지 확인하십시오."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-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."
-msgstr ""
-"이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP을 사용하려"
-"면 LDAP을 지원하는 에볼루션을 설치해야 합니다."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
-"없습니다."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "자세한 오류 메시지:"
-
-#: ../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"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"이 쿼리에 서버에서 리턴하기로 설정한 것보다 많은 카드가 일치하거나,\n"
-"에볼루션에서 표시하도록 설정한 것보다 많은 카드가 일치하였습니다.\n"
-"좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서 \n"
-"결과의 한계치를 지정하십시오."
-
-#: ../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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"쿼리에 걸린 시간이 서버의 시간 제한이나 이 주소록에서 설정한 시간 제한을\n"
-"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉터리 서버 기본 설정에서\n"
-"시간 제한을 늘려 보십시오."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../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: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: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:265
-msgid "card.vcf"
-msgstr "카드.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "주소록 선택"
-
-# 파일 이름
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "목록"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "연락처 이동"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "연락처 복사"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "연락처 이동"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "연락처 복사"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "가져오는 중..."
 
@@ -1705,48 +1757,48 @@ msgstr "에볼루션 vCard 가져오기"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "페이지 %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "표준 출력 대신에 출력할 파일을 지정합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "<출력파일>"
 
 # command line help
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "로컬 주소록 폴더 목록을 표시합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "카드를 vcard 혹은 csv 파일로 표시합니다"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "명령행 인자에 오류가 발생했습니다. --help 옵션을 사용해 사용법을 확인하십시"
 "오."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "csv 혹은 vcard 형식만을 지원합니다."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "처리하지 못한 오류"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "파일을 열 수 없습니다"
@@ -1756,6 +1808,124 @@ msgstr "파일을 열 수 없습니다"
 msgid "Failed to open client '%s': %s"
 msgstr "'%s' 클라이언트를 여는데 실패했습니다: %s"
 
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "업무 전자메일"
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "집 전자메일"
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "기타 전자메일"
+
+#: ../addressbook/util/eab-book-util.c:44
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "업무 SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "집 SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "기타 SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "재버"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "야후"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "가두가두"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "그룹와이즈"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "스카이프"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "트위터"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "구글 토크"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "전자메일"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "메신저"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "전화"
+
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1793,19 +1963,18 @@ msgstr "연기 모드(_S)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-html-editor-actions.c:1008
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:843
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1027
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "편집(_E)"
@@ -1814,16 +1983,16 @@ msgstr "편집(_E)"
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "해제(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:250
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
 msgstr "위치:"
 
@@ -1839,72 +2008,72 @@ 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:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "일"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../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:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "시간"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../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:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "분"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "에볼루션 알림"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "미리 알림이 %d개 있습니다"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "경고"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "아니요(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "예(_Y)"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1921,7 +2090,7 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "이 메시지를 다시 보지 않습니다."
 
@@ -1930,7 +2099,7 @@ msgid "invalid time"
 msgstr "잘못된 시간"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1938,7 +2107,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1948,7 +2117,7 @@ msgstr[0] "%d분"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2343,64 +2512,188 @@ msgstr "메모 목록이 연결 중지 상태에서 사용할 수 있게 표시
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "'{0}' 달력을 여는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "'{0}' 메모 목록을 여는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+msgstr "'{0}' 작업 목록을 여는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "행사를 '{0}' 달력에 만드는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록에 만드는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록에 만드는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "행사를 '{0}' 달력에서 수정하는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록에서 수정하는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록에서 수정하는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "행사를 '{0}' 달력에서 삭제하는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록에서 삭제하는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록에서 삭제하는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "'{0}' 달력의 행사를 업데이트하는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "'{0}' 메모 목록의 메모를 업데이트하는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "'{0}' 작업 목록의 작업을 업데이트하는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "'{0}' 달력의 행사를 업데이트하는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "메모를 '{0}' 메모 목록에 보내는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "작업을 '{0}' 작업 목록에 보내는데 실패했습니다"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+msgid "Error creating view for the calendar '{0}'"
+msgstr "'{0}' 달력에 대한 보기를 만드는데 오류"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+msgid "Error creating view for the task list '{0}'"
+msgstr "'{0}' 작업 목록에 대한 보기를 만드는데 오류"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+msgid "Error creating view for the memo list '{0}'"
+msgstr "'{0}' 메모 목록에 대한 보기를 만드는데 오류"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "행사를 '{0}' 달력으로 복사하는데 실패했습니다"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "작업을 '{0}' 작업 목록으로 복사하는데 실패했습니다"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 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
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "행사를 '{0}' 달력으로 옮기는데 실패했습니다"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 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
+#: ../calendar/calendar.error.xml.h:139
 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
+#: ../calendar/calendar.error.xml.h:141
 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
+#: ../calendar/calendar.error.xml.h:143
 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
+#: ../calendar/calendar.error.xml.h:145
 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
+#: ../calendar/calendar.error.xml.h:147
 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
+#: ../calendar/calendar.error.xml.h:149
 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
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "메모를 '%s' 메모 목록으로 옮기는 중"
 
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to refresh calendar '{0}'"
+msgstr "'{0}' 달력을 새로 고치는데 실패했습니다"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+msgid "Failed to refresh task list '{0}'"
+msgstr "'{0}' 작업 목록을 새로 고치는데 실패했습니다"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+msgid "Failed to refresh memo list '{0}'"
+msgstr "'{0}' 메모 목록을 새로 고치는데 실패했습니다"
+
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "해당 사항을 옮길 수 있게 만들기 실패했습니다"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2411,19 +2704,21 @@ msgstr "요약"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "포함"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 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:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "설명"
@@ -2439,37 +2734,39 @@ msgstr "등급"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "같음"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "다름"
 
 #. 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:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "공개"
 
 #. 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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "개인"
 
 # 비밀 옵션
 #. 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:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "비밀"
 
@@ -2493,26 +2790,29 @@ msgid "Location"
 msgstr "위치"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 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:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "Attachments"
 msgstr "첨부"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Exist"
-msgstr "존재함"
+msgstr "있음"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
-msgstr "존재하지 않음"
+msgstr "없음"
 
 #: ../calendar/gui/caltypes.xml.h:19
 #: ../calendar/gui/dialogs/event-editor.c:309
@@ -2556,22 +2856,22 @@ msgid "Edit Reminder"
 msgstr "미리 알림 편집"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "알림 팝업 창 표시"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "사운드 재생"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "프로그램 실행"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
@@ -2630,10 +2930,6 @@ msgstr "미리 알림 반복(_R):"
 msgid "extra times every"
 msgstr "번, 주기:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "옵션"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "사용자 설정 메시지(_M)"
@@ -2675,7 +2971,7 @@ msgstr "동작/시작 옵션"
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "미리 알림"
 
@@ -2732,277 +3028,282 @@ msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습
 msgid "Could not save attachments"
 msgstr "첨부를 저장할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "약속 편집"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "모임 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "약속 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "할당한 작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "메모 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "요약 없음"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "본래 항목을 유지하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "서버와 동기화할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:387 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:864
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "현재 창을 닫습니다"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:885
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:964 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "복사(_C)"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:887
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "선택한 사항을 복사합니다"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:892
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:894
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1322
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "선택한 사항을 잘라냅니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:901
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "선택한 사항을 삭제합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "도움말 보기"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:920
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:978 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1334
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "클립보드에서 붙여 넣습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:441 ../mail/e-mail-reader.c:2262
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
-#: ../modules/addressbook/e-book-shell-view-actions.c:1167
-#: ../modules/calendar/e-cal-shell-view-actions.c:1801
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "미리보기(_V)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "현재 바뀐 사항 저장"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "저장 후 닫기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "현재 바뀐 사항을 저장하고 편집기를 닫습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:997
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:999
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "모든 텍스트 선택"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1034
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1015
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1036
 msgid "_Insert"
 msgstr "넣기(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:431
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1076 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1057 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:380
 msgid "_Attachment..."
 msgstr "첨부(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:382 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "파일을 첨부합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "분류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "표준 시간대(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "표준 시간대 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "공개(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "공개로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "개인 정보(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "개인 정보로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "비밀(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "비밀로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "역할 항목(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "역할 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "응답바람(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "응답요청 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "상태 항목(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "상태 항목을 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "종류 항목(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "참석자 종류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:665
 msgid "Attach"
 msgstr "첨부"
 
@@ -3013,7 +3314,7 @@ msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
 #: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "첨부"
 
@@ -3026,21 +3327,25 @@ msgstr "현재 버전을 사용할 수 없습니다!"
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "받을 곳을 열 수 없습니다"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "오브젝트를 만들 수 없습니다"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "행사를 %s 달력으로 복사하는 중"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "소스를 열 수 없습니다"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "메모를 '%s' 메모 목록으로 복사하는 중"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "작업을 '%s' 작업 목록으로 복사하는 중"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3050,73 +3355,6 @@ msgstr "이 항목을 다른 수신자의 메일함에서도 지움(_D)"
 msgid "_Retract comment"
 msgstr "메모 철회(_R):"
 
-# event -> 행사, Microsoft Office XP 참고
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "dbus 오류 때문에 이 행사를 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "dbus 오류 때문에 이 작업을 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "dbus 오류 때문에 이 메모를 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "dbus 오류 때문에 이 항목을 삭제할 수 없습니다: %s"
-
-# event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "권한이 거부되어 이 행사를 삭제할 수 없습니다"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "권한이 거부되어 이 작업을 삭제할 수 없습니다"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "권한이 거부되어 이 메모를 삭제할 수 없습니다"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "권한이 거부되어 이 항목을 삭제할 수 없습니다"
-
-# event -> 행사, Microsoft Office XP 참고
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "오류 때문에 이 행사를 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "오류 때문에 이 작업을 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "오류 때문에 이 메모를 삭제할 수 없습니다: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "오류 때문에 이 항목을 삭제할 수 없습니다: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
@@ -3183,7 +3421,7 @@ msgstr "약속 있음/없음(_F):"
 msgid "Query free / busy information for the attendees"
 msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "약속"
 
@@ -3212,7 +3450,7 @@ msgstr "행사 전체를 편집할 수 없습니다. 주최자가 아닙니다"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "행사에 미리 알림이 있습니다"
 
@@ -3221,60 +3459,60 @@ msgstr "행사에 미리 알림이 있습니다"
 msgid "Or_ganizer:"
 msgstr "주최자(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1931
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "대리인(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1940
 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:3451
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약속 %d일 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3282,18 +3520,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:3463
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약속 %d분 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
-msgstr "사용자 지정"
+#: ../calendar/gui/dialogs/event-page.c:3491
+msgid "Custom"
+msgstr "사용자 설정"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "없음"
@@ -3346,6 +3584,8 @@ msgstr "위치(_L):"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:514
+#: ../e-util/e-html-editor-link-dialog.c:367
 msgid "_Description:"
 msgstr "설명(_D):"
 
@@ -3368,7 +3608,7 @@ msgstr "행사 설명"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "참석자(_N)..."
 
@@ -3377,11 +3617,6 @@ msgstr "참석자(_N)..."
 msgid "_Reminder"
 msgstr "미리 알림(_R)"
 
-# Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "사용자 설정 미리 알림:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "1월"
@@ -3435,11 +3670,11 @@ msgid "Select Date"
 msgstr "날짜 선택"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "오늘 선택(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "메모"
 
@@ -3460,10 +3695,11 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "메모 전체를 편집할 수 없습니다. 주최자가 아닙니다"
 
 #: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:201
-#: ../em-format/e-mail-formatter-utils.c:218
-#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "받는 사람"
 
@@ -3787,8 +4023,8 @@ msgstr "새 참석자에게만 알림(_O)"
 msgid "_Send Options"
 msgstr "보내기 옵션(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "작업"
 
@@ -3819,76 +4055,76 @@ msgid ""
 msgstr ""
 "작업을 편집할 수 없습니다. 선택한 작업 목록이 할당된 작업을 지원하지 않습니다"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 msgid "High"
 msgstr "높음"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "보통"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "낮음"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../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-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "시작 안함"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "진행중"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -3896,11 +4132,11 @@ msgstr "완료됨"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "취소함"
 
@@ -3936,62 +4172,62 @@ msgstr "분류(_L):"
 msgid "_Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "새 약속"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "새 하루 종일 행사"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "새 모임"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "오늘로 이동"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "날짜로 이동"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "미리 알림 있음."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "반복 있음."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "모임."
 
 # a11y 스트링, event는 행사가 아니라 UI 이벤트
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "달력 이벤트: 요약은 %s."
 
 # a11y 스트링, event는 행사가 아니라 UI 이벤트
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "달력 이벤트: 요약 없음."
 
 # a11y 스트링, event는 행사가 아니라 UI 이벤트
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "달력 보기 이벤트"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "포커스 받음"
 
 # a11y 스트링, event는 행사가 아니라 UI 이벤트
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4000,89 +4236,33 @@ msgstr[0] "이벤트 %d개 있음."
 # a11y 스트링, event는 행사가 아니라 UI 이벤트
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:160 ../calendar/gui/ea-week-view.c:156
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "이벤트 없음."
 
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "근무일 주별 보기: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:175
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "일별 보기: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:209
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "달력 보기, 근무 주 단위"
 
-#: ../calendar/gui/ea-day-view.c:211
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "달력 보기, 일 단위"
 
-#: ../calendar/gui/ea-day-view-main-item.c:326
-#: ../calendar/gui/ea-week-view-main-item.c:353
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "현재 시간 구간을 보고 선택하는 표"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "그놈 달력"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%Y년 %b %d일 %A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %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:210 ../calendar/gui/e-day-view.c:2795
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%b %d일 (%a)"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%Y년 %b %d일 (%a)"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%Y년 %b %d일"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. 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:246 ../calendar/gui/e-day-view.c:2811
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%b %d일"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "이동 단추"
@@ -4093,60 +4273,60 @@ msgid "Click here, you can find more events."
 msgstr "여기를 누르면 더 많은 이벤트를 찾을 수 있습니다."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d일"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d주"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "알 수 없는 동작 수행"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s 약속 시작 전"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s 약속 시작 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "약속 시작에 %s"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s 약속 끝나기 전"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s 약속 끝난 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "약속 끝날 때 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%s)"
@@ -4154,30 +4334,30 @@ msgstr "%s (%s)"
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션에 대한 %s"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "월별 보기: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:167
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "주별 보기: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:201
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "한 달 단위로 달력 보기"
 
-#: ../calendar/gui/ea-week-view.c:203
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "주 단위로 달력 보기"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "제목 없음"
@@ -4186,52 +4366,55 @@ msgstr "제목 없음"
 msgid "Categories:"
 msgstr "분류:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "요약:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "시작 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "끝 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "마감 날짜:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "상태:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "우선 순위:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "설명:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1608
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "행사를 %s 달력으로 복사하는 중"
+msgid "Creating view for calendar '%s'"
+msgstr "'%s' 달력에 대한 보기를 만드는 중"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "행사를 %s 달력으로 옮기는 중"
+msgid "Creating view for task list '%s'"
+msgstr "'%s' 작업 목록에 대한 보기를 만드는 중"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "'%s' 메모 목록에 대한 보기를 만드는 중"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4246,7 +4429,7 @@ msgstr "시작 날짜"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "형태"
 
@@ -4254,7 +4437,7 @@ msgstr "형태"
 msgid "Completion date"
 msgstr "완료 날짜"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "완료"
 
@@ -4276,11 +4459,12 @@ 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:4011
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../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:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "상태"
 
@@ -4297,37 +4481,51 @@ msgstr "만듦"
 msgid "Last modified"
 msgstr "최근 바뀜"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "선택한 행사를 클립보드로 잘라냅니다"
 
-#: ../calendar/gui/e-calendar-view.c:451
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "선택한 행사를 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-calendar-view.c:457
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "클립보드에서 행사를 붙여 넣습니다"
 
-#: ../calendar/gui/e-calendar-view.c:463
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "선택한 행사를 삭제합니다"
 
-#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "선택한 오브젝트를 삭제하는 중입니다"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr "붙여넣은 텍스트에 올바른 iCalendar 데이터가 없습니다"
+
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+msgid "Default calendar not found"
+msgstr "기본 달력이 없습니다"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+msgid "Default memo list not found"
+msgstr "기본 메모 목록이 없습니다"
 
-#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "오브젝트를 업데이트하는 중입니다"
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+msgid "Default task list not found"
+msgstr "기본 작업 목록이 없습니다"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr "적절한 구성 요소가 없습니다"
+
+#: ../calendar/gui/e-calendar-view.c:988
+msgid "Pasting iCalendar data"
+msgstr "iCalendar 데이터 붙여넣기"
 
 #. 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:2083 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "주최자: %s <%s>"
@@ -4335,25 +4533,65 @@ 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:2087 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "주최자: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2103
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2134
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "시간: %s %s"
 
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+msgid "%d %b %Y"
+msgstr "%Y년 %b %d일"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%b %d일"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+msgid "%A %d %b %Y"
+msgstr "%Y년 %b %d일 %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%b %d일 (%a)"
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%Y년 %b %d일 (%a)"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4363,77 +4601,102 @@ msgstr "시작 날짜"
 msgid "End Date"
 msgstr "끝 날짜"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3607
+#: ../modules/itip-formatter/itip-view.c:6197
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "UID가 '%s'인 소스가 없습니다"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+msgid "Creating an event"
+msgstr "행사 만들기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+msgid "Creating a memo"
+msgstr "메모 만들기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+msgid "Creating a task"
+msgstr "작업 만들기"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "반복됨"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "예"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "아니요"
 
-#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6085
+#: ../modules/itip-formatter/itip-view.c:6185
 msgid "Accepted"
 msgstr "수락"
 
-#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6091
+#: ../modules/itip-formatter/itip-view.c:6191
 msgid "Declined"
 msgstr "거부"
 
-#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "잠정적"
 
-#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6094
+#: ../modules/itip-formatter/itip-view.c:6194
 msgid "Delegated"
 msgstr "대리"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "약속 없음"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "약속 있음"
 
@@ -4453,17 +4716,202 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "없음"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "행사 수정"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying a memo"
+msgstr "메모 수정"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr "작업 수정"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:387
+msgid "Removing an event"
+msgstr "행사 제거"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:391
+msgid "Removing a memo"
+msgstr "메모 제거"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing a task"
+msgstr "작업 제거"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:484
+#, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "행사 %d개 삭제"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:488
+#, c-format
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "메모 %d개 삭제"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:492
+#, c-format
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "작업 %d개 삭제"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:692
+#, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "행사 %d개 붙여넣기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:707
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "메모 %d개 붙여넣기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:722
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "작업 %d개 붙여넣기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:820
+msgid "Updating an event"
+msgstr "이벤트 업데이트"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:824
+msgid "Updating a memo"
+msgstr "메모 업데이트"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:828
+msgid "Updating a task"
+msgstr "작업 업데이트"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:933
+#, c-format
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "%s 달력의 없앨 행사 가져오기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:937
+#, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "%s 메모 목록의 없앨 메모 가져오기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:941
+#, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "%s 작업 목록의 없앨 작업 가져오기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:962
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "%s 달력의 행사 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:966
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "%s 메모 목록의 메모 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:970
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "%s 작업 목록의 작업 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:1068
+msgid "Purging events"
+msgstr "행사 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:1072
+msgid "Purging memos"
+msgstr "메모 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:1076
+msgid "Purging tasks"
+msgstr "작업 없애기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:1178
+msgid "Expunging completed tasks"
+msgstr "끝마친 작업 말소"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "행사 %d개 옮기기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2035
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "행사 %d개 복사"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2041
+#, c-format
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "메모 %d개 옮기기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2042
+#, c-format
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "메모 %d개 복사"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2048
+#, c-format
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "작업 %d개 옮기기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/e-cal-ops.c:2049
+#, c-format
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "작업 %d개 복사"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4473,16 +4921,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1985 ../calendar/gui/e-week-view.c:1539
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1988 ../calendar/gui/e-week-view.c:1542
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "오후"
 
@@ -4492,13 +4940,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:2778 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 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:3442
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "%d주"
@@ -4509,17 +4957,17 @@ 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:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 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:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4527,7 +4975,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "없음"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4634,69 +5082,69 @@ msgstr "실패 이유: %s"
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "부재 중"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "정보 없음"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "옵션(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "근무 시간만 보이기(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "축소해서 보이기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4705,7 +5153,7 @@ msgstr ""
 "요약: %s\n"
 "위치: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "요약: %s"
@@ -4734,46 +5182,46 @@ msgstr "공통 이름"
 msgid "Language"
 msgstr "언어"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "메모"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* 요약 없음 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "시작: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "기한: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "선택한 메모를 클립보드로 잘라 냅니다"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "선택한 메모를 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "클립보드에서 메모를 붙여 넣습니다"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "선택한 메모를 삭제합니다"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "보이는 모든 메시지 선택"
 
@@ -4785,40 +5233,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:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/importers/icalendar-importer.c:1062
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1560
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "작업"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "선택한 작업을 클립보드로 잘라냅니다"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "선택한 작업을 클립보드로 복사합니다"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "클립보드에서 작업을 붙여 넣습니다"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "선택한 작업을 삭제합니다"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "보이는 모든 작업 선택"
 
@@ -4829,42 +5277,38 @@ 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:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%B %d일"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "비우는 중"
-
-#: ../calendar/gui/itip-utils.c:648 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "주최자를 결정해야 합니다."
 
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "참석자가 최소한 한 사람은 필요합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:928 ../calendar/gui/itip-utils.c:1089
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "행사 정보"
 
-#: ../calendar/gui/itip-utils.c:931 ../calendar/gui/itip-utils.c:1092
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/itip-utils.c:934 ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "메모 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1113
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "약속 있음/없음 정보"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "달력 정보"
 
@@ -4872,7 +5316,7 @@ msgstr "달력 정보"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:977
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "수락"
@@ -4881,7 +5325,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:984
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
@@ -4893,7 +5337,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:991 ../calendar/gui/itip-utils.c:1039
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "거절"
@@ -4902,7 +5346,7 @@ msgstr "거절"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:998
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "대리"
@@ -4910,7 +5354,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:1011
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "업데이트됨"
@@ -4918,7 +5362,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:1018
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "취소"
@@ -4927,7 +5371,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:1025
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "새로운 사항"
@@ -4935,156 +5379,170 @@ 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:1032
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "반대제안"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1110
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "약속 있음/없음 정보 (%s부터 %s까지)"
+msgstr "약속 있음/없음 정보(%s부터 %s까지)"
 
-#: ../calendar/gui/itip-utils.c:1118
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendar 정보"
 
-#: ../calendar/gui/itip-utils.c:1146
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "리소스를 예약할 수 없습니다. 새 행사가 다른 행사와 충돌합니다."
 
-#: ../calendar/gui/itip-utils.c:1154
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "리소스를 예약할 수 없습니다. 오류는: %s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "리소스를 예약할 수 없습니다. 오류: "
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1326
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "이 행사의 참석자여야 합니다."
 
-#: ../calendar/gui/print.c:660
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/itip-utils.c:1917
+msgid "Sending an event"
+msgstr "행사 보내기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../calendar/gui/itip-utils.c:1921
+msgid "Sending a memo"
+msgstr "메모 보내기"
+
+#: ../calendar/gui/itip-utils.c:1925
+msgid "Sending a task"
+msgstr "작업 보내기"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4일"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9일"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14일"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19일"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20일"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21일"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22일"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23일"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24일"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25일"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26일"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27일"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28일"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29일"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30일"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31일"
 
@@ -5092,44 +5550,44 @@ msgstr "31일"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "월"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "화"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "수"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "목"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "금"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "토"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 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:3319
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr "부터 "
 
@@ -5137,21 +5595,21 @@ msgstr "부터 "
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
 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:3335
+#: ../calendar/gui/print.c:3325
 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:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (기한 "
 
@@ -5159,40 +5617,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:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "참석자: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "연락처:"
 
@@ -5206,12 +5664,14 @@ msgid "% Completed"
 msgstr "% 완료"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "보다 큼"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "보다 적음"
 
@@ -5219,181 +5679,185 @@ msgstr "보다 적음"
 msgid "Appointments and Meetings"
 msgstr "약속 및 모임"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "달력을 여는 중입니다"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 파일 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "에볼루션 iCalendar 가져오기"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "미리 알림!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 파일 (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "에볼루션 vCalendar 가져오기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "달력 행사"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1098
+msgid "Gnome Calendar"
+msgstr "그놈 달력"
+
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr "에볼루션 달력 똑똑한 가져오기"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "모임"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "행사"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "작업"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "메모"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "반복 있음"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "인스턴스임"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "미리 알림 있음"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "첨부 있음"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "공개"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "개인"
 
 # 비밀 옵션
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "비밀"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "등급"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "요약"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "위치"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "시작"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "기한"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "끝"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "분류"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "완료됨"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "주최자"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "참석자"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "설명"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "형태"
@@ -6947,151 +7411,184 @@ msgstr "태평양/월리스"
 msgid "Pacific/Yap"
 msgstr "태평양/얍"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "이 메시지 다시 보지 않기(_D)"
+
+#: ../composer/e-composer-actions.c:265
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:389
 msgid "Close the current file"
 msgstr "현재 파일을 닫습니다"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:394
 msgid "New _Message"
 msgstr "새 메시지(_M)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:396
 msgid "Open New Message window"
 msgstr "새 메시지 창을 엽니다"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:934
+#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "기본 설정(_P)"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:936
+#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "에볼루션 설정"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:410
 msgid "Save the current file"
 msgstr "현재 파일을 저장합니다"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:415
 msgid "Save _As..."
 msgstr "다른 이름으로 저장(_A)..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:417
 msgid "Save the current file with a different name"
 msgstr "현재 파일을 다른 이름으로 저장합니다"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:424
 msgid "Character _Encoding"
 msgstr "문자 인코딩(_E)"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:448
 msgid "Print Pre_view"
 msgstr "인쇄 미리 보기(_V)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:455
 msgid "Save as _Draft"
 msgstr "임시 보관함에 저장(_D)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:457
 msgid "Save as draft"
 msgstr "임시 보관함에 저장"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:462
 msgid "S_end"
 msgstr "보내기(_E)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:464
 msgid "Send this message"
 msgstr "이 메시지를 지금 보냅니다"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:472
 msgid "PGP _Encrypt"
 msgstr "PGP 암호화(_E)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:474
 msgid "Encrypt this message with PGP"
 msgstr "이 메시지를 PGP로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:480
 msgid "PGP _Sign"
 msgstr "PGP 서명(_S)"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:482
 msgid "Sign this message with your PGP key"
 msgstr "이 메시지를 PGP키로 서명합니다"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:488
 msgid "_Picture Gallery"
 msgstr "사진 갤러리(_P)"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:490
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "메시지에 끌어 놓을 사진 모음을 표시합니다"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:496
 msgid "_Prioritize Message"
 msgstr "메시지 우선순위 높이기(_P)"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:498
 msgid "Set the message priority to high"
 msgstr "메시지 우선순위를 높입니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:504
 msgid "Re_quest Read Receipt"
 msgstr "내용 읽음 확인 요청(_Q)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:506
 msgid "Get delivery notification when your message is read"
 msgstr "메시지를 읽으면 배달 확인 받기"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:512
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 암호화(_C)"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:514
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "이 메시지를 S/MIME 암호화 인증서로 암호화합니다"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:520
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 서명(_N)"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:522
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "이 메시지를 S/MIME 서명 증명으로 서명합니다"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:576
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Unicode smileys"
+msgstr "유니코드 이모티콘"
+
+#: ../composer/e-composer-actions.c:578
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr "이모티콘에 유니코드 문자 사용."
+
+#: ../composer/e-composer-actions.c:584
 msgid "_Bcc Field"
 msgstr "숨은 참조 항목(_B)"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:586
 msgid "Toggles whether the BCC field is displayed"
 msgstr "숨은 참조 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:592
 msgid "_Cc Field"
 msgstr "참조 항목(_C)"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:594
 msgid "Toggles whether the CC field is displayed"
 msgstr "참조 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:600
+msgid "_From Override Field"
+msgstr "보내는 사람 바꾸기 항목 (_F)"
+
+#: ../composer/e-composer-actions.c:602
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "보내는 사람 바꾸기 항목을 표시할지 토글합니다(보내는 이름이나 메일 주소를 바꿉니다)"
+
+#: ../composer/e-composer-actions.c:608
 msgid "_Reply-To Field"
 msgstr "답장 주소 항목(_R)"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "답장 주소 항목을 표시할지 토글합니다"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:671
 msgid "Save Draft"
 msgstr "임시 저장"
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:327
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "이름(_N):"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "메시지를 받을 사람을 입력하십시오"
@@ -7108,49 +7605,49 @@ msgstr ""
 "메시지의 받는 사람 목록에 나타나지 않고 참조 메시지를 받을 주소를 입력하십시"
 "오."
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:793
 msgid "Fr_om:"
 msgstr "보낸 사람(_O):"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:800
 msgid "_Reply-To:"
 msgstr "답장 주소(_R):"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:805
 msgid "_To:"
 msgstr "받는 사람(_T):"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:811
 msgid "_Cc:"
 msgstr "참조(_C):"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:817
 msgid "_Bcc:"
 msgstr "숨은 참조(_B):"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:822
 msgid "_Post To:"
 msgstr "게시 위치(_P):"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:826
 msgid "S_ubject:"
 msgstr "제목(_U):"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:834
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "서명(_G):"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "주소록을 보려면 누르십시오"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7158,7 +7655,7 @@ msgstr ""
 "보내는 메시지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7167,20 +7664,16 @@ msgstr ""
 "보내는 메시지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
 msgid "Compose Message"
 msgstr "메시지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4568
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "메일 작성에 텍스트가 아닌 메시지 본문이 들어 있습니다. 이 메시지 본문은 편집"
 "할 수 없습니다."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "제목 없는 메시지"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "&quot;{0}&quot; 파일을 이 메시지에 첨부할 수 없습니다."
@@ -7264,69 +7757,73 @@ msgid "_Save Draft"
 msgstr "임시 저장(_S)"
 
 #: ../composer/mail-composer.error.xml.h:20
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "정말로 작성중인 메시지를 버리시겠습니까?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "메시지를 만들 수 없습니다."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "&quot;{0}&quot; 때문에, 다른 메일 옵션을 선택해야 할 수도 있습니다."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; 서명 파일을 읽을 수 없습니다."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "모든 계정을 지웠습니다."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "메일을 작성하기 전에 계정을 설정해야 합니다."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "보낼 편지함 폴더를 저장하는 중에 오류가 발생했습니다."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "확인된 오류는 &quot;{0}&quot;입니다. 메시지를 보내지 않았습니다."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "임시 보관함 폴더를 저장하는 중에 오류가 발생했습니다."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr ""
 "확인된 오류는 &quot;{0}&quot;입니다. 메시지는 저장되지 않았을 것입니다."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 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:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "확인된 오류는 &quot;{0}&quot;입니다."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "보낼 편지함에 저장(_S)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "다시 시도(_T)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "메시지를 보냈지만 보낸 뒤의 처리 과정 중에 오류가 발생했습니다."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "메시지를 보낼 편지함에 저장하는 중입니다."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7336,6 +7833,16 @@ msgstr ""
 "장합니다. 에볼루션 도구 모음에서 보내기/받기 단추를 누르면 메시지를 보낼 수 "
 "있습니다."
 
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to send the message?"
+msgstr "정말로 메시지를 보내시겠습니까?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr "메시지를 보내는 단축키를 눌렀습니다. 실수였다면 메시지 보내기를 취소하시고, 아니면 메시지를 보내십시오."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "에볼루션 알림"
@@ -7344,27 +7851,13 @@ msgstr "에볼루션 알림"
 msgid "Calendar event notifications"
 msgstr "달력 행사 알림"
 
-#: ../data/evolution.appdata.xml.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr "에볼루션은 개인 정보 관리 프로그램으로 메일, 달력, 주소록 기능이 통합되어 있습니다."
-
-#: ../data/evolution.appdata.xml.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr "에볼루션은 광범위한 산업 표준 데이터 포맷과 정보 교환용 네트워크 프로토콜을 표준 준수와 보안을 염두에 두고 지원합니다. 또 에볼루션은 \"익스체인지 웹 서비스\"(EWS) 확장 
기능을 이용해 마이크로소프트 익스체인지와 연동할 수도 있습니다."
-
 #: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "에볼루션"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "그룹웨어 모음"
 
@@ -7378,7 +7871,9 @@ msgstr "전자메일, 연락처, 일정을 관리합니다"
 
 #: ../data/evolution.desktop.in.in.h:5
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "email;메일;전자메일;편지;calendar;달력;캘린더;일정;contact;연락처;addressbook;주소록;task;작업;할일;"
+msgstr ""
+"email;메일;전자메일;편지;calendar;달력;캘린더;일정;contact;연락처;"
+"addressbook;주소록;task;작업;할일;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -7475,6 +7970,50 @@ msgstr "미리 보기 창 보기"
 msgid "Whether to show the preview pane."
 msgstr "미리 보기 창을 볼지 여부."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "참"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "편집기에서 전화번호 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "편집기에서 SIP 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "편집기에서 메신저 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "편집기에서 집 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "편집기에서 직장 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "편집기에서 기타 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "편집기에서 웹 주소 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "편집기에서 직장 정보 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "편집기에서 기타 정보 표시할지 여부"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "편집기에서 메모 표시할지 여부"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "메시지 텍스트를 유니코드로 변환"
@@ -7487,6 +8026,17 @@ msgstr ""
 "메시지 텍스트를 유니코드 UTF-8로 변환하여 여러가지 문자셋으로 된 스팸/햄 토큰"
 "을 통일합니다."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "보고필터를 실행할 전체 명령어 경로"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr "보고필터 명령어의 전체 경로. 설정하지 않으면 컴파일할 때 찾은 경로를 사용합니다. 보통 /usr/bin/bogofilter입니다. 명령어에는 아무 인자도 쓰지 않습니다."
+
 # Reminder -> 미리 알림, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
@@ -8014,7 +8564,7 @@ msgstr "일별 보기 및 근무일 주별 보기에 보일 시간 간격(분 
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
-msgstr "표준 시간대 "
+msgstr "표준 시간대"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
@@ -8194,7 +8744,7 @@ msgstr "메시지를 작성할 기본 문자셋."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
-msgstr "사진 갤러리가 그림 파일을 찾을 경로"
+msgstr "사진 갤러리가 이미지 파일을 찾을 경로"
 
 # 현재 구현에서는, 한국어로 실행한 경우 xdg의 "~/사진" 폴더를 사용한다.
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
@@ -8227,35 +8777,37 @@ msgid "Automatic emoticon recognition"
 msgstr "이모티콘 자동 인식"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "텍스트 스마일리를 인식하고 그림으로 바꿉니다."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr "텍스트 이모티콘을 인식하고 이미지나 유니코드 문자로 바꿉니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "인용 메시지"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
 msgstr "메시지에 답장할 때, 메시지의 원저자를 표시하는 텍스트"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "전달 메시지"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
 msgstr ""
 "메시지를 전달할 때, 다음 내용이 전달한 메시지라는 사실을 안내하는 텍스트"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "원문 메시지"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -8263,11 +8815,11 @@ msgstr ""
 "메시지에 답장할 때(위에 답장 내용을 쓸 경우), 다음 내용이 원본 메시지라는 사"
 "실을 안내하는 텍스트"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr "그룹 답장을 설정하면 리스트로 답장합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8277,11 +8829,11 @@ msgstr ""
 "일반 \"전체 답장\" 동작과는 다르게, 이 옵션을 사용하면 \"그룹 답장\" 도구 모"
 "음 단추를 사용했을 때 원본 메일의 해당 메일링 리스트에만 답장합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr "커서를 답장 맨 아래에 놓습니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 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 "
@@ -8291,30 +8843,22 @@ msgstr ""
 "맨 아래에 놓을지 결정합니다."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr "항상 내용 읽음 확인 요청"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "기본값으로 내용 읽음 확인 요청을 모든 메시지에 추가할지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr "기본으로 HTML 메일을 보냅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "맞춤법 검사 색"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "내장 맞춤법 검사를 사용할 때 맞춤법이 틀린 단어에 밑줄 그을 색."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "맞춤법 검사 언어"
@@ -8348,10 +8892,20 @@ msgstr ""
 "때 보기 메뉴에서 선택합니다."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show \"From\" override field when sending a mail message"
+msgstr "메일 메시지를 보낼 때 \"보내는 사람\" 필드 표시"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid ""
+"Show the \"From\" override 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
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "메일 메시지를 보낼 때 \"답장 주소\" 필드 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8359,11 +8913,11 @@ msgstr ""
 "메일 메시지를 보낼 때 \"답장 주소\" 필드를 표시합니다. 이 옵션은 메일 계정이 "
 "있을 때 보기 메뉴에서 선택합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "뉴스그룹에 글을 쓸 때 \"보낸 사람\" 필드 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8371,11 +8925,11 @@ msgstr ""
 "뉴스그룹에 글을 쓸 때 \"보낸 사람\" 필드를 표시합니다. 이 옵션은 뉴스 계정이 "
 "있을 때 보기 메뉴에서 선택합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "뉴스그룹에 글을 쓸 때 \"답장 주소\" 필드 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8383,22 +8937,22 @@ msgstr ""
 "뉴스그룹에 글을 쓸 때 \"답장 주소\" 필드를 표시합니다. 이 옵션은 뉴스 계정이 "
 "있을 때 보기 메뉴에서 선택합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Digitally sign replies when the original message is signed"
 msgstr "원문이 서명되어 있으면 답장도 디지털 서명하기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 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 서명 사용."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "파일 이름을 아웃룩/지메일 방식으로 인코딩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8410,11 +8964,21 @@ msgstr ""
 "습니다. 아웃룩이나 지메일은 RFC 2231을 따르지 않고 올바르지 않은 방법으로 "
 "RFC 2047 표준을 사용하고 있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Send messages through Outbox folder"
+msgstr "메시지를 보낼 편지함 폴더에 저장"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr "메시지를 보내면 항상 편지함 폴더에 저장합니다. 사용자가 언제 메시지를 보낼지 지정할 수 있습니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr "답장 위에 개인 서명을 넣습니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 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 "
@@ -8424,22 +8988,22 @@ msgstr ""
 "맨 아래에 놓을지 결정합니다."
 
 # 메일의 서명 앞에 들어 있는 '--' 따위
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "서명 구분 문자를 추가하지 않기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "참이면 메일을 작성할 때 서명 앞에 구분하는 문자를 추가하지 않습니다."
 
 # Reply-To: 헤더를 나타낸다. 콜론으로 끝날 필요 없음.
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
-msgstr "리스트 Reply-To: 무시"
+msgstr "리스트 Reply-To: 무시:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8456,11 +9020,11 @@ msgstr ""
 "니다. 이 기능은 Reply-To: 헤더를 List-Post: 헤더와 비교하는 식으로 동작합니"
 "다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr "지역화한 'Re'의 목록"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -8469,41 +9033,56 @@ msgstr ""
 "지역화된 'Re' 약어의 목록으로, 메시지에 답장할 때 제목에 붙어 있으면 무시합니"
 "다. 기본 \"Re\" 접두어에 추가할 사항. 예를 들어, 'SV,AV'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Enable developer mode"
+msgstr "개발자 모드 사용"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr "개발 및 디버깅 목적의 감춰진 기능과 도구를 사용합니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "Number of characters for wrapping"
+msgstr "줄바꿈 문자 수"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Will autowrap lines after given number of characters."
+msgstr "주어진 수의 문자 다음에 자동으로 줄을 바꿉니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Save file format for drag-and-drop operation"
 msgstr "끌어놓기 작업에 사용할 파일 저장 포맷"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "'mbox' 또는 'pdf'가 가능."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Show image animations"
-msgstr "그림 애니메이션 보기"
+msgstr "이미지 애니메이션 보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
-msgstr ""
-"HTML 메일에서 애니메이션을 허용합니다. 많은 사용자는 애니메이션 그림을 좋아하"
-"지 않고 정지된 그림을 보고 싶어합니다."
+msgstr "HTML 메일에서 애니메이션을 허용합니다. 많은 사용자는 애니메이션 이미지를 좋아하지 않고 정지된 이미지를 보고 싶어합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "텍스트 입력 미리 검색 기능 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "가장자리 창에서 폴더 이름을 검색할 수 있게 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable magic space bar"
 msgstr "만능 스페이스바 사용 여부"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8511,117 +9090,122 @@ msgstr ""
 "이 기능을 사용하면 스페이스바 키를 이용해 메시지 미리 보기, 메시지 목록, 폴더"
 "를 스크롤합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "이 기능을 사용하면 모든 폴더에 비슷한 메시지 목록 보기 설정을 사용합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "이 기능을 사용하면 모든 폴더에 비슷한 메시지 목록 보기 설정을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Mark citations in the message \"Preview\""
 msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메시지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Citation highlight color"
 msgstr "인용문 강조 색"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Citation highlight color."
 msgstr "인용문 강조 색."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "캐릿 모드를 켭니다, 이 모드에서는 메일을 읽을 때 커서가 보입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Default charset in which to display messages"
 msgstr "메시지를 표시할 기본 문자셋"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Default charset in which to display messages."
 msgstr "메시지를 표시할 기본 문자셋."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Automatically load images for HTML messages over HTTP"
-msgstr "HTTP를 통해 HTML 메시지의 그림을 자동으로 읽어들입니다"
+msgstr "HTTP를 통해 HTML 메시지의 이미지를 자동으로 읽어들입니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show Animations"
 msgstr "애니메이션 보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show animated images as animations."
-msgstr "애니메이션이 들어 있는 그림을 애니메이션으로 봅니다."
+msgstr "애니메이션이 들어 있는 이미지를 애니메이션으로 봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show all message headers"
 msgstr "모든 메시지 헤더 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show all the headers when viewing a messages."
 msgstr "메시지를 볼 때 모든 헤더를 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "List of headers to show when viewing a message."
 msgstr "메시지를 볼 때 표시할 헤더 목록."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "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 ""
-"헤더마다 해당하는 다음 쌍이 있습니다; 헤더 이름 및 그 헤더를 사용할지 여부를 "
-"나타내는 불리언 값. 사용하지 않는 헤더는 메시지를 볼 때 표시하지 않지만, 기"
-"본 설정에는 여전히 있습니다."
+msgstr "헤더마다 해당하는 다음 쌍이 있습니다: 헤더 이름 및 그 헤더를 사용할지 여부를 나타내는 불리언 값. 사용하지 않는 헤더는 메시지를 볼 때 표시하지 않지만, 기본 설정에는 여전히 
있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show photo of the sender"
 msgstr "보낸 사람의 사진을 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "메시지 읽기 창에서 보낸 사람의 사진을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid "Search gravatar.com for photo of the sender"
+msgstr "보낸 사람의 gravatar.com 사진 검색"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "보낸 사람의 사진을 gravatar.com에서 검색하도록 허용합니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout for marking messages as seen"
 msgstr "메시지를 읽은 것으로 표시하는 경과 시간"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "메시지를 읽은 것으로 표시하는 경과 시간, 밀리초 단위."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Sender email-address column in the message list"
 msgstr "메시지 목록의 보낸 사람 전자메일 주소 열"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8629,7 +9213,7 @@ msgstr ""
 "세로 보기의 \"메시지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8637,19 +9221,19 @@ msgstr ""
 "세로 보기의 \"메시지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할지 결정합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages in the message-list"
 msgstr "메시지 목록에 삭제한 메시지를 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "메시지 목록에 삭제한 메시지를 표시합니다(취소선을 긋습니다)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable Unmatched search folder"
 msgstr "해당 없음 검색 폴더 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8657,11 +9241,11 @@ msgstr ""
 "검색 폴더에서 해당 없음 검색 폴더를 사용합니다. 검색 폴더를 사용하지 않으면 "
 "아무 일도 하지 않습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "폴더별 미리 보기를 감추고 선택을 없앱니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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."
@@ -8669,31 +9253,31 @@ msgstr ""
 "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록에서 메일 선택"
 "을 제거하고 그 폴더에 대한 미리 보기를 없앱니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane"
 msgstr "메시지 목록 창의 높이"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Height of the message-list pane."
 msgstr "메시지 목록 창의 높이."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "인터페이스에 메시지 헤더를 접을지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "메시지 목록 창의 너비"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "메시지 목록 창의 너비."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "배치 방식"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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 "
@@ -8704,35 +9288,35 @@ msgstr ""
 "\"0\"은(전통적 방식) 미리 보기 창을 메시지 목록 아래에 둡니다. \"1\"은(세로 "
 "보기) 미리 보기 창을 메시지 목록 옆에 나란히 둡니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "메일을 표시할 때 사용할 가변폭 글꼴."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "메일을 표시할 때 사용할 터미널 글꼴."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "메일을 표시할 때 사용자 지정 글꼴을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조의 주소를 간략하게 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8740,11 +9324,11 @@ msgstr ""
 "받는 사람/참조/숨은 참조의 주소를 address_count에 지정한 개수만큼 간략하게 표"
 "시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조에 표시할 주소의 길이"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8752,11 +9336,11 @@ msgstr ""
 "기본 메시지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "제목에 따라 메시지 목록을 글타래 표시합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8764,11 +9348,11 @@ msgstr ""
 "메시지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
 "래 표시를 할 것인지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "글타래 확장 상태에 대한 기본값"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8776,11 +9360,11 @@ msgstr ""
 "이 설정은 글타래를 기본값으로 펼친 상태로 할지 접힌 상태로 할지 지정합니다. "
 "에볼루션을 다시 시작해야 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할지 여부"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 "
@@ -8789,11 +9373,11 @@ msgstr ""
 "이 설정은 해당 글타래의 최근 메시지를 기준으로 글타래를 정렬할지 여부를 지정"
 "합니다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "폴더 구조에서 계정을 사전 순서대로 표시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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 "
@@ -8804,27 +9388,27 @@ msgstr ""
 "순서대로 정렬합니다. 단, \"이 컴퓨터\"와 \"검색\" 폴더는 예외입니다. 거짓이"
 "면 계정을 사용자가 지정한 순서대로 정렬합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "필터 동작 기록"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 필터 동작을 기록합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "필터 동작을 기록할 로그 파일"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "필터 동작을 기록할 로그 파일입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "필터링 후에 보낸 편지함 플러시"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -8834,44 +9418,54 @@ msgstr ""
 "달' 필터 동작을 사용했을 경우 및 마지막 동작을 실행한 후 약 1분 뒤에 일어납니"
 "다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "기본 전달 모양새"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Default reply style"
 msgstr "기본 답장 모양새"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "단축키를 사용할 때 (Ctrl+Enter) 안내"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr "단축키로 메시지를 보내려고 할 때 사용자에게 물어봅니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt when emptying the trash"
 msgstr "지운 메시지를 비울 때 확인"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "지운 메시지를 비울 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user expunges"
 msgstr "완전히 지울 때 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메시지를 완전히 지우려 할 때 물어봅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "메일 주소로 입력하지 않은 수신자에게 보낼 때 물어보기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8879,48 +9473,48 @@ msgstr ""
 "메일 주소로 입력하지 않은 수신자에게 메시지를 보낼 경우 반복해서 경고하는 기"
 "능을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했을 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10개 이상의 메시지를 열려고 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "여러 개 메시지에 표시하려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "여러 개의 메시지에 표시할 때 확인 질문을 할지 여부."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when deleting messages in search folder"
 msgstr "검색 폴더에서 메시지를 지울 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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 "
@@ -8929,11 +9523,11 @@ msgstr ""
 "검색 결과에서 제거하는 게 아니라, 찾기 폴더에서 메시지를 지울 경우 메시지를 "
 "영구히 삭제한다고 반복해서 경고하는 기능을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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 "
@@ -8944,11 +9538,11 @@ msgstr ""
 "음, 'always' - 물어보지 않고 끌어놓기로 폴더 구조에서 폴더 복사 허용, 'ask' "
 "- (아니면 기타 다른 모든 값) 사용자에게 확인 질문."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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 "
@@ -8959,11 +9553,11 @@ msgstr ""
 "않음, 'always' - 물어보지 않고 끌어놓기로 폴더 구조에서 폴더 옮기기 허용, "
 "'ask' - (아니면 기타 다른 모든 값) 사용자에게 확인 질문."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying privately to list messages"
 msgstr "메일링 리스트 메시지에 개인 답장을 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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."
@@ -8971,11 +9565,11 @@ msgstr ""
 "메일링 리스트에서 받은 메시지에 개인 답장을 보낼 경우 반복해서 경고하는 기능"
 "을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "메일링 리스트에서 개인 답장을 가로채려 할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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 "
@@ -8985,68 +9579,68 @@ msgstr ""
 "서 Reply-To: 헤더가 설정되어 있어서 답장을 리스트로 보내게 되는 경우 반복해"
 "서 경고하는 확인 창을 끄고 켭니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when replying to many recipients"
 msgstr "많은 수신자에게 답장할 때 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Empty Trash folders on exit"
 msgstr "끝날 때 지운 메시지 폴더를 비웁니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 지운 메시지 폴더를 비웁니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Minimum days between emptying the trash on exit"
 msgstr "끝날 때 휴지통을 비울 최소 날짜 간격"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Last time Empty Trash was run"
 msgstr "마지막으로 휴지통을 비운 시각"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Level beyond which the message should be logged."
 msgstr "어떤 메시지를 기록할지 단계."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "원래의 \"날짜\" 헤더 값을 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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 "
@@ -9056,11 +9650,11 @@ msgstr ""
 "현지 시각으로 표시합니다.) 거짓이면 \"Date\" 헤더 값을 사용자가 지정한 형식"
 "과 현지 표준 시간대에 맞춰 표시합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "List of Labels and their associated colors"
 msgstr "레이블 및 레이블 색의 목록"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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."
@@ -9068,45 +9662,45 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 레이블 목록입니다. 이 목록에는 <이름>:<색> "
 "형식의 문자열이 들어 있습니다. 색은 HTML 방식 16진수 인코딩을 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Check incoming mail being junk"
 msgstr "정크메일 검사"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Run junk test on incoming mail."
 msgstr "받은 메일에 대해 정크메일 검사를 실행합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Empty Junk folders on exit"
 msgstr "끝날 때 정크메일 폴더를 비웁니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 정크 메일 폴더를 비웁니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Minimum days between emptying the junk on exit"
 msgstr "끝날 때 정크 메일을 비울 최소 날짜 간격"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Last time Empty Junk was run"
 msgstr "마지막으로 정크 메일을 비운 시각"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "정크 메일 후크에 대한 기본 플러그인"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9116,11 +9710,11 @@ msgstr ""
 "다. 기본 목록 플러그인을 사용하지 않는 경우, 사용 가능한 다른 플러그인을 대"
 "신 사용하지 않습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "주소록에서 보낸 사람 전자메일을 찾아볼 지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9131,13 +9725,13 @@ msgstr ""
 "팸 메일이 아니라고 판단합니다. 자동 완성 용도로도 주소록을 찾아 봅니다. LDAP"
 "와 같은 원격 주소록을 자동 완성에 사용할 경우 느릴 수도 있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9147,11 +9741,11 @@ msgstr ""
 "알려진 사람이 보낸 메일을 제외할 때, 로컬 주소록에서만 주소를 찾아 볼지 여부"
 "를 결정합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "정크 메일 검사에 사용자 지정 헤더를 사용할지 결정합니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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 "
@@ -9160,11 +9754,11 @@ msgstr ""
 "정크 메일 검사에 사용자 지정 헤더를 사용할지 결정합니다. 이 옵션을 사용하고 "
 "헤더를 지정하면 정크 메일 검사 기능의 속도를 높일 수 있습니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Custom headers to use while checking for junk."
 msgstr "정크 메일을 검사할 때 사용할 사용자 지정 헤더."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9172,31 +9766,31 @@ msgstr ""
 "정크 메일을 검사할 때 사용할 사용자 지정 헤더. 목록의 각 항목은 \"헤더이름=값"
 "\" 형식의 문자열입니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Save directory"
 msgstr "저장 디렉터리"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for saving mail component files."
 msgstr "메일 관련 파일을 저장할 디렉터리."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Composer load/attach directory"
 msgstr "메시지 작성 읽어들이기/첨부 디렉터리"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Directory for loading/attaching files to composer."
 msgstr "메시지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉터리."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages on start"
 msgstr "시작할 때 새 메시지를 검사"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9204,12 +9798,12 @@ msgstr ""
 "에볼루션을 시작할 때 새 메시지를 확인할지 여부. 이 때 보낼 편지함의 메시지도 "
 "보냅니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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 "
@@ -9219,11 +9813,11 @@ msgstr ""
 "용 중인 계정의 새 메시지를 확인할지 여부. 이 옵션은 \"send_recv_on_start\" 옵"
 "션과 같이만 사용합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Server synchronization interval"
 msgstr "서버 동기화 주기"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9231,11 +9825,33 @@ msgstr ""
 "얼마나 자주 로컬의 변경 사항을 원격 메일 서버와 동기화할지 정합니다. 이 간격"
 "은 최소한 30초 이상 되어야 합니다."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+msgid "Allow expunge in virtual folders"
+msgstr "가상 폴더에서 비우기 허용"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr "가상 폴더에서 비우기를 허용합니다. 가상 폴더에서 폴더->비우기 메뉴를 사용할 수 있습니다. 단 가상 폴더에서 비우기를 하면 가상 폴더에 해당하는 메시지만 삭제하는 게 아니라, 
해당 가상 폴더에서 사용하는 모든 폴더의 모든 삭제된 메시지를 비웁니다."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+msgid "An Archive folder for On This Computer folders."
+msgstr "이 컴퓨터 폴더의 모음 폴더."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr "이 컴퓨터 폴더에서 사용할 때 메시지|모음... 기능에서 사용할 모음 폴더."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "(Deprecated) Default forward style"
 msgstr "(없어질 예정) 기본 전달 모양새"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9243,11 +9859,11 @@ msgstr ""
 "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대"
 "신 \"forward-style-name\"을 사용하십시오."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "(Deprecated) Default reply style"
 msgstr "(없어질 예정) 기본 답장 모양새"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9255,11 +9871,11 @@ msgstr ""
 "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대"
 "신 \"reply-style-name\"을 사용하십시오."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(없어질 예정) 사용자 지정 헤더와 그 헤더를 사용할지 여부의 목록."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9267,11 +9883,11 @@ msgstr ""
 "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대"
 "신 \"show-headers\"를 사용하십시오."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "(Deprecated) Load images for HTML messages over HTTP"
-msgstr "(없어질 예정) HTTP를 통해 HTML 메시지의 그림을 읽어들입니다"
+msgstr "(없어질 예정) HTTP를 통해 HTML 메시지의 이미지를 읽어들입니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9279,7 +9895,7 @@ msgstr ""
 "이 키는 3.10 버전부터 사용을 권장하지 않으며 이제 사용하지 말아야 합니다. 대"
 "신 \"image-loading-policy\"를 사용하십시오."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9287,7 +9903,7 @@ msgstr ""
 "(없어질 예정) 사용자가 창에 표시된 메시지를 전달하거나 메시지에 답장하는 경"
 "우 메시지 창을 닫을지 여부를 물어봅니다"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9404,15 +10020,13 @@ msgstr "메일 작성 창에서 키를 누르면 자동으로 편집기 실행."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
 msgid "Insert Face picture by default"
-msgstr "얼굴 그림 기본값으로 포함"
+msgstr "얼굴 이미지 기본값으로 포함"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
-msgstr ""
-"보내는 메시지에 얼굴 그림을 기본으로 포함할지 여부. 그림은 미리 지정해 놓아"
-"야 합니다. 그림을 지정하지 않았으면 아무 일도 하지 않습니다."
+msgstr "보내는 메시지에 얼굴 이미지를 기본으로 포함할지 여부. 이미지는 미리 지정해 놓아야 합니다. 이미지를 지정하지 않았으면 아무 일도 하지 않습니다."
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
 msgid "Delete processed"
@@ -9573,7 +10187,7 @@ msgstr "최초 파일 선택 폴더"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 대화 상자의 최초 폴더."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "연결 중지 상태에서 시작"
 
@@ -9663,15 +10277,37 @@ msgstr "로컬 스팸 테스트만 사용합니다."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다(DNS는 사용하지 않습니다)."
 
-#: ../em-format/e-mail-formatter-attachment.c:407
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "스팸어새신을 실행할 전체 명령어 경로"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr "스팸어새신 명령어의 전체 경로. 설정하지 않으면 컴파일할 때 찾은 경로를 사용합니다. 보통 /usr/bin/spamassassin입니다. 명령어에는 아무 인자도 쓰지 않습니다."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "sa-learn을 실행할 전체 명령어 경로"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr "sa-learn 명령어의 전체 경로. 설정하지 않으면 컴파일할 때 찾은 경로를 사용합니다. 보통 /usr/bin/sa-learn입니다. 명령어에는 아무 인자도 쓰지 않습니다."
+
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "첨부"
 
-#: ../em-format/e-mail-formatter-attachment.c:408
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "첨부로 표시"
 
@@ -9684,8 +10320,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "첨부 파일을 내장 오디오 플레이어에서 재생"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "보낸 사람"
 
@@ -9693,19 +10329,19 @@ msgstr "보낸 사람"
 msgid "(no subject)"
 msgstr "(제목 없음)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "이 메시지는 %s이(가) %s 자격으로 보냈습니다."
 
 #: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
-msgstr "일반 그림"
+msgstr "일반 이미지"
 
 # tooltip
 #: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
-msgstr "이 부분을 그림으로 표시합니다"
+msgstr "이 부분을 이미지로 표시합니다"
 
 #: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
@@ -9718,8 +10354,8 @@ msgstr "이 부분을 RFC822 메시지로 표시합니다"
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
-#: ../modules/cal-config-google/e-google-chooser.c:236
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1301
+#: ../modules/cal-config-google/e-google-chooser.c:1303
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "이름"
@@ -9729,70 +10365,50 @@ msgstr "이름"
 msgid "Size"
 msgstr "크기"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "GPG 서명됨"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "GPG 암호화됨"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "S/MIME 서명됨"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "S/MIME 암호화됨"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
-msgid "Security"
-msgstr "보안"
-
-#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "제목"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "메일 프로그램"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
-#: ../em-format/e-mail-formatter-text-enriched.c:96
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "리치텍스트"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:93
-#: ../em-format/e-mail-formatter-text-enriched.c:97
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "이 부분을 리치텍스트로 표시"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:93
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:94
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:361
 msgid "Format part as HTML"
 msgstr "이 부분을 HTML로 표시합니다"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:117
-#: ../em-format/e-mail-formatter-text-plain.c:195
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Plain Text"
 msgstr "일반 텍스트"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:118
-#: ../em-format/e-mail-formatter-text-plain.c:196
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "일반 텍스트로 표시"
 
@@ -9906,7 +10522,7 @@ msgstr ""
 "적인 시간 내에 다른 사람이 이 메시지의 내용을 알아 내는 건 매우 어렵습니다."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
@@ -9915,27 +10531,50 @@ msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
 # 소스 코드를 그대로 표시한다는 뜻
-#: ../em-format/e-mail-formatter-source.c:118
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "원본"
 
 # 소스 코드를 그대로 표시한다는 뜻
-#: ../em-format/e-mail-formatter-source.c:119
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "MIME 부분의 원본을 표시"
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "참조"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "숨은 참조"
 
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "GPG 서명됨"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+msgid "GPG encrypted"
+msgstr "GPG 암호화됨"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "S/MIME 서명됨"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+msgid "S/MIME encrypted"
+msgstr "S/MIME 암호화됨"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "보안"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9946,12 +10585,12 @@ msgstr "MBOX 부분을 파싱하는데 오류: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "S/MIME 메시지를 분석할 수 없습니다: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "PGP 메시지를 분석할 수 없습니다: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -10004,367 +10643,42 @@ msgstr "PGP/MIME 메시지를 분석할 수 없습니다: %s"
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "회신 주소"
 
 #: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
 #: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "날짜"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "뉴스그룹"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "얼굴"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "표준"
-
-# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "무단 전제 금지"
-
-# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "비밀"
-
-# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "일급비밀"
-
-# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "혼자서만 보기"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "없음"
-
-# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "메일 내용 읽음 확인"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "회신 요청(_E)"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "다음 기한 안에(_T):"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "일"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "편리한 때에(_W)"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "회신"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "메시지 배달 지연(_D)"
-
-# FIXME: bad msgid
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "다음 뒤에(_A):"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "일"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "만료 날짜 설정(_S)"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "기한(_U):"
-
-#: ../e-util/e-send-options.ui.h:25
-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):"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "일반 옵션(_R)"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "정보 추적을 위한 보낸 항목 만들기(_E)"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "배달됨(_D)"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "배달됨 및 열림(_V)"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "모든 정보(_A)"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "보낸 항목 자동으로 삭제(_U)"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "상태 추적"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "열면(_W):"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "거부당하면(_N):"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "완성되면(_M):"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "받아들여지면(_P):"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "반송 메일 알림"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "상태 추적(_T)"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-msgid "_Apply"
-msgstr "적용(_A)"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "정렬(_S)..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "모으기(_G)..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "표시할 필드(_F)..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "모두 지우기(_A)"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "뷰에서 필드 표시(_S)"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "증가"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "감소"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "항목 모음 기준"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "뷰에서 필드 표시(_F)"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "다음 기준"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "뷰에서 필드 표시(_N)"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "뷰에서 필드 표시(_V)"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "정렬"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "모두 지우기"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "항목 정렬 기준"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "표준 시간대를 선택하십시오"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"왼쪽 마우스 단추로 지도에서 특정 지역을 확대한 다음 표준 시간대를 선택하십시"
-"오.\n"
-"오른쪽 마우스 단추로 축소합니다."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "표준 시간대"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "선택(_S)"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "표준 시간대 드롭다운 콤보 상자"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "받는 메일"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "현재 시각"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "지정하는 시각"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "현재 시각까지의 상대적인 시간"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "초"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "주"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "달"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "연도"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "전에"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "앞으로"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "다음 메일에 대한 필터 표시:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "필터 규칙(_F)"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "비교할 시각:"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"필터링하는 현재 시각을 기준으로\n"
-"메시지 시각을 비교합니다."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"지정한 날짜의 오전 12:00를 기준으로\n"
-"메시지 시각을 비교합니다."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"필터링하는 시각까지 얼마나 지났나를 기준으로\n"
-"메시지 시각을 비교합니다."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "새 뷰 만들기(_C)"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "이름(_N):"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%Y년 %B %d일"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "현재 뷰 바꾸기(_R)"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "달력: %s에서 %s까지"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "취소"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "에볼루션 달력 항목"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10396,24 +10710,95 @@ msgstr "%s (취소하는 중)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1779
+msgid "Cancel"
+msgstr "취소"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "이 메시지를 닫습니다(Esc)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+msgid "Failed to create a thread: "
+msgstr "스레드를 만드는데 실패: "
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "아이콘 보기"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "목록 보기"
 
+#. To Translators: This text is set as a description of an attached
+#. * 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:1197
+msgid "Attached message"
+msgstr "첨부한 메시지"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+msgid "Operation was cancelled"
+msgstr "작업 취소됨"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
+#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+msgid "A load operation is already in progress"
+msgstr "읽어들이기 동작이 이미 진행 중입니다"
+
+#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+msgid "A save operation is already in progress"
+msgstr "저장 동작이 이미 진행 중입니다"
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "'%s'을(를) 읽어들일 수 없습니다"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "첨부를 읽어들일 수 없습니다"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "'%s'을(를) 열 수 없습니다"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "첨부를 열 수 없습니다."
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "첨부 내용을 읽어들이지 않았습니다"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "'%s'을(를) 저장할 수 없습니다"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "첨부를 저장할 수 없습니다"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "첨부 속성"
@@ -10426,54 +10811,64 @@ msgstr "파일 이름(_I):"
 msgid "MIME Type:"
 msgstr "MIME 종류:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 우선(_S)"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "배경으로 설정할 수 없습니다"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "읽어들이는 중"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "저장하는 중"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "첨부 모음 숨기기(_B)"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "첨부 모음 보이기(_B)"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "첨부 추가"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "첨부(_T)"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr "다음 형식으로 선택한 디렉터리 보관:"
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "첨부 저장"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:653
+msgid "Do _not extract files from the attachment"
+msgstr "첨부의 파일 압축 풀지 않기(_N)"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr "압축 푼 파일만 저장(_O)"
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr "압축 파일과 압축 푼 파일을 모두 저장(_A)"
 
 #: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
@@ -10499,12 +10894,12 @@ msgid "A_dd Attachment..."
 msgstr "첨부파일 추가(_D)..."
 
 #: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "_Properties"
 msgstr "속성(_P)"
 
@@ -10534,56 +10929,6 @@ msgstr "\"%s\"에서 열기"
 msgid "Open this attachment in %s"
 msgstr "이 첨부를 \"%s\"에서 열기"
 
-#. To Translators: This text is set as a description of an attached
-#. * 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:1108
-msgid "Attached message"
-msgstr "첨부한 메시지"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "읽어들이기 동작이 이미 진행 중입니다"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "저장 동작이 이미 진행 중입니다"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "'%s'을(를) 읽어들일 수 없습니다"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "첨부를 읽어들일 수 없습니다"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "'%s'을(를) 열 수 없습니다"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "첨부를 열 수 없습니다."
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "첨부 내용을 읽어들이지 않았습니다"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "'%s'을(를) 저장할 수 없습니다"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "첨부를 저장할 수 없습니다"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "기본 주소록으로 표시"
@@ -10601,6 +10946,44 @@ msgstr "연결 중지 상태 작업을 위해 주소록 내용 로컬에 복사"
 msgid "Ctrl-click to open a link"
 msgstr "다음 링크를 열려면 Ctrl과 마우스 단추를 누르십시오:"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "이전 달"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "다음 달"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "이전 연도"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "다음 연도"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "달별 달력"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y년"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%Y년 %B"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "기본 달력으로 표시"
@@ -10629,44 +11012,6 @@ msgstr "연결 중지 상태 작업을 위해 작업 목록 내용을 로컬에
 msgid "Copy memo list contents locally for offline operation"
 msgstr "연결 중지 상태 작업을 위해 메모 목록 내용을 로컬에 복사"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y년"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%Y년 %B"
-
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "이전 달"
-
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "다음 달"
-
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "이전 연도"
-
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "다음 연도"
-
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "달별 달력"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "현재 사용 분류(_U):"
@@ -10675,17 +11020,26 @@ msgstr "현재 사용 분류(_U):"
 msgid "_Available Categories:"
 msgstr "사용 가능한 분류(_A):"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1055
+#: ../e-util/e-categories-editor.c:274
+msgctxt "category"
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-editor.c:278
+msgctxt "category"
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: ../e-util/e-categories-editor.c:282
+msgctxt "category"
+msgid "_Delete"
+msgstr "삭제(_D)"
+
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "아이콘"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "\"%s\" 분류 만들기"
@@ -10696,7 +11050,7 @@ msgstr "분류 아이콘"
 
 #: ../e-util/e-category-editor.c:140
 msgid "_No Image"
-msgstr "그림 없음(_N)"
+msgstr "이미지 없음(_N)"
 
 #: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
@@ -10721,13 +11075,18 @@ msgstr "설정에 이미 '%s' 분류가 있습니다. 다른 이름을 사용하
 msgid "popup list"
 msgstr "팝업 목록"
 
+# ???
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "현재"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "오늘"
@@ -10743,32 +11102,15 @@ msgstr "없음"
 msgid "OK"
 msgstr "확인"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 
-# ???
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1839
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "퍼센트 값은 0에서 100까지 값입니다"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "문자 인코딩"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "사용할 문자셋 입력하십시오"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "그 외..."
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "아랍어"
@@ -10846,11 +11188,194 @@ msgstr "우크라이나어"
 msgid "Visual"
 msgstr "비주얼"
 
-#: ../e-util/e-client-cache.c:1161
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "문자 인코딩"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "사용할 문자셋 입력하십시오"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "그 외..."
+
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "확장자 이름 '%s'에서 클라이언트 오브젝트를 만들 수 없습니다"
 
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "사용자 설정 색"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "검정"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "옅은 갈색"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "갈색빛 금색"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "어두운 초록 #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "네이비"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "어두운 파랑"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "보라 #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "아주 어두운 회색"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "어두운 빨강"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "붉은 주황"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "금색"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "어두운 초록"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "흐릿한 파랑"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "파랑"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "흐릿한 자주"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "어두운 회색"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "빨강"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "주황"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "라임색"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "흐릿한 초록"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "흐릿한 파랑 #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "하늘색 #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "보라"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "회색"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "자홍색"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "밝은 주황"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "노랑"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "초록"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "청록"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "밝은 파랑"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "붉은 자주"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "옅은 회색"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "분홍"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "옅은 주황"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "옅은 노랑"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "옅은 초록"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "옅은 청록"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "옅은 파랑"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "옅은 자주"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "하양"
+
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3858
+#: ../mail/mail-config.ui.h:69
+msgid "Default"
+msgstr "기본값"
+
 #: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "날짜 및 시간"
@@ -10966,15 +11491,120 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "다음 %a"
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "로캘 기본값 사용"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "형식:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr "미소(_S)"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr "슬픔(_A)"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+msgid "_Wink"
+msgstr "윙크(_W)"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr "메롱(_G)"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr "웃음(_H)"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+msgid "_Plain"
+msgstr "무표정(_P)"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr "히죽(_R)"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr "당황(_E)"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr "큰 미소(_B)"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr "불확실(_T)"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr "놀라움(_U)"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr "걱정(_O)"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr "뽀뽀(_K)"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr "분노(_N)"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr "차분(_C)"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "천사(_L)"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "울음(_Y)"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "아픔(_I)"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "피곤(_D)"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr "악마(_V)"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+msgid "_Monkey"
+msgstr "원숭이(_M)"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(알 수 없는 파일 이름)"
@@ -11101,23 +11731,23 @@ msgstr "비교할 시각을 선택하십시오"
 msgid "Choose a File"
 msgstr "파일을 선택하십시오"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "규칙 이름(_U):"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "다음 조건 모두"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "다음 조건 중 하나"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "다음에 해당하는 항목 찾기(_F):"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "다음 조건이 만족하는 항목을 찾습니다"
 
@@ -11125,38 +11755,1044 @@ msgstr "다음 조건이 만족하는 항목을 찾습니다"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
+#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "없음"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "관계된 모두"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "회신"
+
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "회신 및 그 상위 메일"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "회신 없거나 상위 메일 없음"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "글타래 포함(_N):"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "조건 추가(_D)"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "받는 메일"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "보내는 메일"
 
+#: ../e-util/e-html-editor-actions.c:57
+msgid "Failed to insert HTML file."
+msgstr "HTML 파일을 넣는데 실패했습니다."
+
+#: ../e-util/e-html-editor-actions.c:94
+msgid "Failed to insert text file."
+msgstr "텍스트 파일을 넣는데 실패했습니다."
+
+#: ../e-util/e-html-editor-actions.c:482
+msgid "Insert HTML File"
+msgstr "HTML 파일 넣기"
+
+#: ../e-util/e-html-editor-actions.c:488
+msgid "HTML file"
+msgstr "HTML 파일"
+
+#: ../e-util/e-html-editor-actions.c:515
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "이미지 넣기"
+
+#: ../e-util/e-html-editor-actions.c:576
+msgid "Insert text file"
+msgstr "텍스트 파일 넣기"
+
+#: ../e-util/e-html-editor-actions.c:582
+msgid "Text file"
+msgstr "텍스트 파일"
+
+# tooltip
+#: ../e-util/e-html-editor-actions.c:966
+msgid "Copy selected text to the clipboard"
+msgstr "선택한 텍스트를 클립보드로 복사합니다"
+
+# tooltip
+#: ../e-util/e-html-editor-actions.c:973
+msgid "Cut selected text to the clipboard"
+msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
+
+# tooltip
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:980
+msgid "Paste text from the clipboard"
+msgstr "텍스트를 클립보드에서 붙여넣습니다"
+
+# tooltip
+#: ../e-util/e-html-editor-actions.c:987
+msgid "Redo the last undone action"
+msgstr "최근에 실행 취소한 동작을 다시 실행합니다"
+
+# tooltip
+#: ../e-util/e-html-editor-actions.c:1001
+msgid "Undo the last action"
+msgstr "최근 동작을 실행 취소합니다"
+
+#: ../e-util/e-html-editor-actions.c:1022
+msgid "For_mat"
+msgstr "형식(_M)"
+
+#: ../e-util/e-html-editor-actions.c:1029
+msgid "_Paragraph Style"
+msgstr "문단 모양(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1043
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "정렬(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1050
+msgid "Current _Languages"
+msgstr "현재 언어(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1067
+msgid "_Increase Indent"
+msgstr "들여쓰기 늘이기(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1069
+msgid "Increase Indent"
+msgstr "들여쓰기 늘이기"
+
+#: ../e-util/e-html-editor-actions.c:1074
+msgid "_HTML File..."
+msgstr "HTML 파일(_H)..."
+
+#: ../e-util/e-html-editor-actions.c:1081
+msgid "Te_xt File..."
+msgstr "텍스트 파일(_X)..."
+
+#: ../e-util/e-html-editor-actions.c:1088
+msgid "Paste _Quotation"
+msgstr "인용 붙여넣기(_Q)"
+
+#: ../e-util/e-html-editor-actions.c:1095
+msgid "_Find..."
+msgstr "찾기(_F)..."
+
+#: ../e-util/e-html-editor-actions.c:1097
+msgid "Search for text"
+msgstr "텍스트 검색."
+
+#: ../e-util/e-html-editor-actions.c:1102
+msgid "Find A_gain"
+msgstr "다시 찾기(_G)"
+
+#: ../e-util/e-html-editor-actions.c:1109
+msgid "Re_place..."
+msgstr "바꾸기(_P)..."
+
+#: ../e-util/e-html-editor-actions.c:1111
+msgid "Search for and replace text"
+msgstr "텍스트를 찾아서 바꿉니다"
+
+#: ../e-util/e-html-editor-actions.c:1116
+msgid "Check _Spelling..."
+msgstr "맞춤법 검사(_S)..."
+
+#: ../e-util/e-html-editor-actions.c:1123
+msgid "_Decrease Indent"
+msgstr "들여쓰기 줄이기(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1125
+msgid "Decrease Indent"
+msgstr "들여쓰기 줄이기"
+
+#: ../e-util/e-html-editor-actions.c:1130
+msgid "_Wrap Lines"
+msgstr "줄 바꿈(_W)"
+
+#: ../e-util/e-html-editor-actions.c:1137
+msgid "Open Inspector"
+msgstr "검사 열기"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1147
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "가운데(_C)"
+
+#: ../e-util/e-html-editor-actions.c:1149
+msgid "Center Alignment"
+msgstr "가운데 정렬"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1154
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "왼쪽(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1156
+msgid "Left Alignment"
+msgstr "왼쪽 정렬"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1161
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "오른쪽(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1163
+msgid "Right Alignment"
+msgstr "오른쪽 정렬(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1171
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1173
+msgid "HTML editing mode"
+msgstr "HTML 편집 모드"
+
+#: ../e-util/e-html-editor-actions.c:1178
+msgid "Plain _Text"
+msgstr "일반 텍스트(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1180
+msgid "Plain text editing mode"
+msgstr "일반 편집 텍스트 모드"
+
+#: ../e-util/e-html-editor-actions.c:1188
+msgid "_Normal"
+msgstr "보통(_N)"
+
+#: ../e-util/e-html-editor-actions.c:1195
+msgid "Header _1"
+msgstr "헤더 _1"
+
+#: ../e-util/e-html-editor-actions.c:1202
+msgid "Header _2"
+msgstr "헤더 _2"
+
+#: ../e-util/e-html-editor-actions.c:1209
+msgid "Header _3"
+msgstr "헤더 _3"
+
+#: ../e-util/e-html-editor-actions.c:1216
+msgid "Header _4"
+msgstr "헤더 _4"
+
+#: ../e-util/e-html-editor-actions.c:1223
+msgid "Header _5"
+msgstr "헤더 _5"
+
+#: ../e-util/e-html-editor-actions.c:1230
+msgid "Header _6"
+msgstr "헤더 _6"
+
+#: ../e-util/e-html-editor-actions.c:1237
+msgid "_Preformatted"
+msgstr "원래 모양대로(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1244
+msgid "A_ddress"
+msgstr "주소(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1251
+msgid "_Blockquote"
+msgstr "단락 인용(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1258
+msgid "_Bulleted List"
+msgstr "동그라미 붙은 목록(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1265
+msgid "_Roman Numeral List"
+msgstr "로마 숫자 붙은 목록(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1272
+msgid "Numbered _List"
+msgstr "숫자 붙은 목록(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1279
+msgid "_Alphabetical List"
+msgstr "알파벳 붙은 목록(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1295
+#: ../e-util/e-html-editor-actions.c:1333
+msgid "_Image..."
+msgstr "이미지(_I)..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1298
+msgid "Insert Image"
+msgstr "이미지 넣기"
+
+#: ../e-util/e-html-editor-actions.c:1303
+#: ../e-util/e-html-editor-actions.c:1340
+msgid "_Link..."
+msgstr "링크(_L)..."
+
+#: ../e-util/e-html-editor-actions.c:1305
+msgid "Insert Link"
+msgstr "링크 넣기"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1311
+#: ../e-util/e-html-editor-actions.c:1355
+msgid "_Rule..."
+msgstr "가로선(_R)..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1314
+msgid "Insert Rule"
+msgstr "가로선 넣기"
+
+#: ../e-util/e-html-editor-actions.c:1319
+#: ../e-util/e-html-editor-actions.c:1362
+msgid "_Table..."
+msgstr "표(_T)..."
+
+#: ../e-util/e-html-editor-actions.c:1321
+msgid "Insert Table"
+msgstr "표 넣기"
+
+#: ../e-util/e-html-editor-actions.c:1326
+msgid "_Cell..."
+msgstr "셀(_C)..."
+
+#: ../e-util/e-html-editor-actions.c:1347
+msgid "Pa_ge..."
+msgstr "페이지(_G)..."
+
+#: ../e-util/e-html-editor-actions.c:1371
+msgid "Font _Size"
+msgstr "글꼴 크기(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1378
+msgid "_Font Style"
+msgstr "글꼴 모양(_F)"
+
+#: ../e-util/e-html-editor-actions.c:1385
+msgid "Paste As _Text"
+msgstr "텍스트로 붙여넣기(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "굵게(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1398
+msgid "Bold"
+msgstr "굵게"
+
+#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "기울임(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1406
+msgid "Italic"
+msgstr "기울임"
+
+#: ../e-util/e-html-editor-actions.c:1412
+msgid "_Plain Text"
+msgstr "일반 텍스트(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "취소선(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1422
+msgid "Strikethrough"
+msgstr "취소선"
+
+#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-text-dialog.c:236
+msgid "_Underline"
+msgstr "밑줄(_U)"
+
+#: ../e-util/e-html-editor-actions.c:1430
+msgid "Underline"
+msgstr "밑줄"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1440
+msgid "-2"
+msgstr "-2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1448
+msgid "-1"
+msgstr "-1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1456
+msgid "+0"
+msgstr "+0"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1464
+msgid "+1"
+msgstr "+1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1472
+msgid "+2"
+msgstr "+2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1480
+msgid "+3"
+msgstr "+3"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1488
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1507
+msgid "Cell Contents"
+msgstr "셀 내용"
+
+#: ../e-util/e-html-editor-actions.c:1514
+msgid "Column"
+msgstr "열"
+
+#: ../e-util/e-html-editor-actions.c:1521
+msgid "Row"
+msgstr "행"
+
+#: ../e-util/e-html-editor-actions.c:1528
+#: ../e-util/e-html-editor-actions.c:1613
+msgid "Table"
+msgstr "테이블"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1538
+msgid "Table Delete"
+msgstr "테이블 삭제"
+
+#: ../e-util/e-html-editor-actions.c:1545 ../e-util/e-text.c:2127
+msgid "Input Methods"
+msgstr "입력기"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1553
+msgid "Table Insert"
+msgstr "테이블 넣기"
+
+#: ../e-util/e-html-editor-actions.c:1560
+msgid "Properties"
+msgstr "속성"
+
+#: ../e-util/e-html-editor-actions.c:1578
+msgid "Column After"
+msgstr "뒤에 열"
+
+#: ../e-util/e-html-editor-actions.c:1585
+msgid "Column Before"
+msgstr "앞에 열"
+
+#: ../e-util/e-html-editor-actions.c:1592
+msgid "Insert _Link"
+msgstr "링크 넣기(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1599
+msgid "Row Above"
+msgstr "위에 행"
+
+#: ../e-util/e-html-editor-actions.c:1606
+msgid "Row Below"
+msgstr "아래에 행"
+
+#: ../e-util/e-html-editor-actions.c:1620
+msgid "Cell..."
+msgstr "셀..."
+
+#: ../e-util/e-html-editor-actions.c:1627
+msgid "Image..."
+msgstr "이미지..."
+
+#: ../e-util/e-html-editor-actions.c:1634
+msgid "Link..."
+msgstr "링크..."
+
+#: ../e-util/e-html-editor-actions.c:1641
+msgid "Page..."
+msgstr "페이지..."
+
+#: ../e-util/e-html-editor-actions.c:1648
+msgid "Paragraph..."
+msgstr "문단..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1656
+msgid "Rule..."
+msgstr "가로선..."
+
+#: ../e-util/e-html-editor-actions.c:1663
+msgid "Table..."
+msgstr "테이블..."
+
+#: ../e-util/e-html-editor-actions.c:1670
+msgid "Text..."
+msgstr "텍스트..."
+
+#: ../e-util/e-html-editor-actions.c:1677
+msgid "Remove Link"
+msgstr "링크 제거"
+
+#: ../e-util/e-html-editor-actions.c:1694
+msgid "Add Word to Dictionary"
+msgstr "사전에 단어 추가"
+
+#: ../e-util/e-html-editor-actions.c:1701
+msgid "Ignore Misspelled Word"
+msgstr "맞춤법이 틀린 단어 무시"
+
+#: ../e-util/e-html-editor-actions.c:1708
+msgid "Add Word To"
+msgstr "단어 추가"
+
+#: ../e-util/e-html-editor-actions.c:1717
+msgid "More Suggestions"
+msgstr "제안 더 보기"
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../e-util/e-html-editor-actions.c:1825
+#, c-format
+msgid "%s Dictionary"
+msgstr "%s 사전"
+
+#: ../e-util/e-html-editor-actions.c:1912
+msgid "_Emoticon"
+msgstr "이모티콘(_E)"
+
+#: ../e-util/e-html-editor-actions.c:1913
+msgid "Insert Emoticon"
+msgstr "이모티콘 넣기"
+
+#: ../e-util/e-html-editor-actions.c:1981
+msgid "Re_place"
+msgstr "바꾸기(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1984
+msgid "_Image"
+msgstr "이미지(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1987
+msgid "_Link"
+msgstr "링크(_L)"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1991
+msgid "_Rule"
+msgstr "가로선(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1994
+#: ../e-util/e-html-editor-cell-dialog.c:668
+msgid "_Table"
+msgstr "테이블(_T)"
+
+#: ../e-util/e-html-editor.c:672
+msgid "Paragraph Style"
+msgstr "문단 모양"
+
+#: ../e-util/e-html-editor.c:686
+msgid "Editing Mode"
+msgstr "편집 모드"
+
+#: ../e-util/e-html-editor.c:698
+msgid "Font Color"
+msgstr "글꼴 색"
+
+#: ../e-util/e-html-editor.c:716
+msgid "Font Size"
+msgstr "글꼴 크기"
+
+#: ../e-util/e-html-editor-cell-dialog.c:628
+msgid "<b>Scope</b>"
+msgstr "<b>범위</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:642
+msgid "C_ell"
+msgstr "셀(_E)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:655
+msgid "_Row"
+msgstr "행(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+msgid "Col_umn"
+msgstr "열(_U)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:691
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr "<b>정렬 및 동작</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+#: ../e-util/e-html-editor-hrule-dialog.c:365
+#: ../e-util/e-html-editor-table-dialog.c:850
+msgid "Left"
+msgstr "왼쪽"
+
+#: ../e-util/e-html-editor-cell-dialog.c:705
+#: ../e-util/e-html-editor-hrule-dialog.c:367
+#: ../e-util/e-html-editor-table-dialog.c:851
+msgid "Center"
+msgstr "가운데"
+
+#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../e-util/e-html-editor-hrule-dialog.c:369
+#: ../e-util/e-html-editor-table-dialog.c:852
+msgid "Right"
+msgstr "오른쪽"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714
+msgid "_Horizontal:"
+msgstr "가로(_H):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+#: ../e-util/e-html-editor-image-dialog.c:581
+msgid "Top"
+msgstr "위"
+
+#: ../e-util/e-html-editor-cell-dialog.c:723
+#: ../e-util/e-html-editor-image-dialog.c:582
+msgid "Middle"
+msgstr "가운데"
+
+#: ../e-util/e-html-editor-cell-dialog.c:724
+#: ../e-util/e-html-editor-image-dialog.c:583
+msgid "Bottom"
+msgstr "아래"
+
+#: ../e-util/e-html-editor-cell-dialog.c:732
+msgid "_Vertical:"
+msgstr "세로(_V):"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:738
+msgid "_Wrap Text"
+msgstr "텍스트 줄바꿈(_W)"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:746
+msgid "_Header Style"
+msgstr "헤더 모양(_H)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:760
+#: ../e-util/e-html-editor-image-dialog.c:521
+#: ../e-util/e-html-editor-table-dialog.c:762
+msgid "<b>Layout</b>"
+msgstr "<b>배치</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:771
+msgid "_Width"
+msgstr "너비(_W)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:810
+msgid "Row S_pan:"
+msgstr "행 범위(_P):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:824
+msgid "Co_lumn Span:"
+msgstr "열 범위(_L):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:831
+#: ../e-util/e-html-editor-table-dialog.c:866
+msgid "<b>Background</b>"
+msgstr "<b>배경</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:844
+#: ../e-util/e-html-editor-table-dialog.c:879
+msgid "Transparent"
+msgstr "투명"
+
+#: ../e-util/e-html-editor-cell-dialog.c:852
+msgid "C_olor:"
+msgstr "색(_O):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:860
+#: ../e-util/e-html-editor-image-dialog.c:483
+#: ../e-util/e-html-editor-table-dialog.c:895
+msgid "Choose Background Image"
+msgstr "배경 이미지로 설정"
+
+#: ../e-util/e-html-editor-cell-dialog.c:865
+#: ../e-util/e-html-editor-image-dialog.c:489
+#: ../e-util/e-html-editor-table-dialog.c:900
+msgid "Images"
+msgstr "이미지"
+
+#: ../e-util/e-html-editor-cell-dialog.c:878
+msgid "_Image:"
+msgstr "이미지(_I):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:885
+#: ../e-util/e-html-editor-page-dialog.c:516
+#: ../e-util/e-html-editor-table-dialog.c:920
+msgid "_Remove image"
+msgstr "이미지 제거(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:905
+msgid "Cell Properties"
+msgstr "셀 속성"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr "해당 없음"
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:232
+msgid "Search _backwards"
+msgstr "뒤로 검색(_B)"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr "대소문자 구별(_S)"
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+msgid "_Wrap Search"
+msgstr "끝나면 처음부터 검색(_W)"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+msgid "Find"
+msgstr "찾기"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:300
+msgid "<b>Size</b>"
+msgstr "<b>크기</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:320
+#: ../e-util/e-html-editor-image-dialog.c:539
+#: ../e-util/e-html-editor-table-dialog.c:773
+msgid "_Width:"
+msgstr "너비(_W):"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:345
+msgid "_Size:"
+msgstr "크기(_S):"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:352
+msgid "<b>Style</b>"
+msgstr "<b>모양</b>"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:377
+#: ../e-util/e-html-editor-table-dialog.c:859
+msgid "_Alignment:"
+msgstr "정렬(_A):"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:383
+msgid "S_haded"
+msgstr "그림자(_H)"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:400
+msgid "Rule properties"
+msgstr "가로선 속성"
+
+#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:716
+msgid "<b>General</b>"
+msgstr "<b>일반</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+msgid "_Source:"
+msgstr "원본(_S):"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr "높이(_H):"
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr "가로 채움(_X):"
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr "세로 채움(_Y):"
+
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:840
+msgid "_Border:"
+msgstr "테두리(_B):"
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+msgid "<b>Link</b>"
+msgstr "<b>링크</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-link-dialog.c:345
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669
+#: ../e-util/e-html-editor-link-dialog.c:350
+msgid "_Test URL..."
+msgstr "URL 테스트(_T)..."
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+msgid "Image Properties"
+msgstr "이미지 속성"
+
+#: ../e-util/e-html-editor-link-dialog.c:374
+msgid "_Remove Link"
+msgstr "링크 제거(_R)"
+
+#: ../e-util/e-html-editor-link-dialog.c:399
+msgid "Link Properties"
+msgstr "링크 속성"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr "구멍 뚫린 종이"
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr "파란 잉크"
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr "종이"
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr "리본"
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr "한밤"
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "임시 보관함"
+
+#: ../e-util/e-html-editor-page-dialog.c:132
+msgid "Graph Paper"
+msgstr "그래프 종이"
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr "<b>색</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+msgid "_Text:"
+msgstr "텍스트(_T):"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr "링크(_L):"
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+msgid "_Background:"
+msgstr "배경(_B):"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr "<b>배경 이미지</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+msgid "_Template:"
+msgstr "서식(_T):"
+
+#: ../e-util/e-html-editor-page-dialog.c:502
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "파일을 고르십시오"
+
+#: ../e-util/e-html-editor-page-dialog.c:509
+msgid "_Custom:"
+msgstr "사용자 설정(_C):"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+msgid "Page Properties"
+msgstr "페이지 속성"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "모양(_S):"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr "<b>정렬</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+msgid "Paragraph Properties"
+msgstr "문단 속성"
+
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, c-format
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] "찾은 항목 %d개 바꿈"
+
+#: ../e-util/e-html-editor-replace-dialog.c:212
+msgid "R_eplace:"
+msgstr "바꾸기(_E):"
+
+#: ../e-util/e-html-editor-replace-dialog.c:224
+msgid "_With:"
+msgstr "다음으로(_W):"
+
+#: ../e-util/e-html-editor-replace-dialog.c:236
+msgid "_Case sensitive"
+msgstr "대소문자 구별(_C)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:240
+msgid "Wra_p search"
+msgstr "끝나면 처음부터 검색(_P)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:250
+msgid "_Skip"
+msgstr "건너뛰기(_S)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:258
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "바꾸기(_R)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:266
+msgid "Replace _All"
+msgstr "전체 바꾸기(_A)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:286
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "바꾸기"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>'%s'에 대한 제안</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr "<b>제안</b>"
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:536
+msgid "Replace"
+msgstr "바꾸기"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+msgid "Replace All"
+msgstr "전체 바꾸기"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "무시"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr "건너뛰기"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+msgid "Back"
+msgstr "뒤로"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr "<b>사전</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+msgid "Add word"
+msgstr "단어 추가"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../mail/mail-config.ui.h:37
+msgid "Spell Checking"
+msgstr "맞춤법 검사"
+
+#: ../e-util/e-html-editor-table-dialog.c:738
+msgid "_Rows:"
+msgstr "행(_R):"
+
+#: ../e-util/e-html-editor-table-dialog.c:755
+msgid "C_olumns:"
+msgstr "열(_O):"
+
+#: ../e-util/e-html-editor-table-dialog.c:806
+msgid "_Spacing:"
+msgstr "여백(_S):"
+
+#: ../e-util/e-html-editor-table-dialog.c:823
+msgid "_Padding:"
+msgstr "채움(_P):"
+
+#: ../e-util/e-html-editor-table-dialog.c:887
+#: ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "색(_C):"
+
+#: ../e-util/e-html-editor-table-dialog.c:913
+msgid "Image:"
+msgstr "이미지:"
+
+#: ../e-util/e-html-editor-table-dialog.c:940
+msgid "Table Properties"
+msgstr "테이블 속성"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "크기(_Z):"
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+msgid "Text Properties"
+msgstr "텍스트 속성"
+
+#: ../e-util/e-html-editor-view.c:3635
+msgid "Changed property"
+msgstr "달력 속성"
+
+#: ../e-util/e-html-editor-view.c:3636
+msgid "Whether editor changed"
+msgstr "편집기가 바뀌었는지 여부"
+
+#: ../e-util/e-html-editor-view.c:7493
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr "HTML 모드를 끄면 텍스트의 모든 형식 표시를 잃어버립니다. 계속 하시겠습니까?"
+
+#: ../e-util/e-html-editor-view.c:7497
+msgid "_Don't lose formatting"
+msgstr "형식 잃지 않기(_D)"
+
+#: ../e-util/e-html-editor-view.c:7498
+msgid "_Lose formatting"
+msgstr "형식 잃기(_L)"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -11164,10 +12800,6 @@ msgid ""
 msgstr ""
 "에볼루션으로 가져 올 파일을 선택하시고, 그 파일의 종류를 목록에서 고르십시오."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "파일을 고르십시오"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "파일 종류(_T):"
@@ -11189,7 +12821,7 @@ msgid "Import a _single file"
 msgstr "파일 한 개 가져오기(_S)"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "다음에서 가져오고 싶은 정보를 선택하십시오:"
 
@@ -11204,7 +12836,7 @@ msgstr ""
 "려면 \"뒤로\" 단추를 누르십시오."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
@@ -11263,27 +12895,27 @@ msgstr "파일을 고르십시오"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "에볼루션으로 파일을 가져오려면 \"적용\"을 누르십시오."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "닫기"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "저장 후 닫기(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "서명 편집"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "서명 이름(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "이름없음"
 
@@ -11291,15 +12923,15 @@ msgstr "이름없음"
 msgid "Add _Script"
 msgstr "스크립트 추가(_S)"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "서명 스크립트 추가"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "서명 스크립트 편집"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11308,11 +12940,11 @@ msgstr ""
 "다음 스크립트의 출력을 서명으로 사용합니다.\n"
 "지정하는 이름은 표시 목적으로만 이용합니다."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "스크립트(_C):"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "스크립트 파일을 실행할 수 있어야 합니다."
 
@@ -11328,14 +12960,34 @@ msgstr ""
 "마우스를 이용해 표준 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 드롭"
 "다운 콤보 상자를 이용해 표준 시간대를 선택해야 합니다."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "링크를 열 수 없습니다."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "에볼루션 도움말을 표시할 수 없습니다."
 
+#: ../e-util/e-misc-utils.c:2348
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "'%s' 달력을 여는 중"
+
+#: ../e-util/e-misc-utils.c:2351
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "'%s' 메모 목록을 여는 중"
+
+#: ../e-util/e-misc-utils.c:2354
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "'%s' 작업 목록을 여는 중"
+
+#: ../e-util/e-misc-utils.c:2357
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "'%s' 주소록을 여는 중"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "연락처 표시"
@@ -11354,10 +13006,10 @@ msgstr "검색(_S):"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "모든 분류"
 
@@ -11376,7 +13028,7 @@ msgstr "주소록"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "연락처"
 
@@ -11385,25 +13037,25 @@ msgid "Select Contacts from Address Book"
 msgstr "주소록에서 연락처 선택"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "내부에 %s 펼치기(_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s 복사(_Y)"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "%s 잘라내기(_U)"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "%s 편집(_E)"
@@ -11413,43 +13065,43 @@ msgstr "%s 편집(_E)"
 msgid "_Delete %s"
 msgstr "%s 삭제(_D)"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "에볼루션은 현재 연결 상태입니다. 연결 중지 상태로 작업하려면 이 단추를 누르십"
 "시오."
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "에볼루션은 현재 연결 중지 상태입니다. 연결 상태로 작업하려면 이 단추를 누르십"
 "시오."
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "에볼루션은 현재 연결 중지 상태입니다. 네트워크를 사용할 수 없습니다."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr "키 모음 키를 사용할 수 없습니다: 사용자나 호스트 이름이 없습니다"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock 키를 누른 상태입니다."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "이 암호 저장(_R)"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "남은 세션 동안 이 암호 저장(_R)"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "이 암호 저장(_R)"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "남은 세션 동안 이 암호 저장(_R)"
 
@@ -11470,67 +13122,69 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "인쇄 시스템에서 추가 오류 내용을 자세히 보고하지 않았습니다."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "방식(_M):"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "데스크톱 설정에 따라"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "데스크톱 설정 열기(_O)"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "수동"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP 프록시:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS 프록시:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_SOCKS 프록시:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "호스트 무시(_I):"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "자동"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "설정 _URL:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "직접 연결 사용, 프록시 불필요."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "기본 프록시 설정으로 전환"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "고급 프록시 설정으로 전환"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "다음 계정에 사용자 설정 프록시 설정 적용:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
-msgstr "<b>고급 프록시 설정</b>에서는 별도의 네트워크 프록시를 따로 정의하고 특정 계정에 대해서만 적용할 수 있습니다."
+msgstr ""
+"<b>고급 프록시 설정</b>에서는 별도의 네트워크 프록시를 따로 정의하고 특정 계"
+"정에 대해서만 적용할 수 있습니다."
 
 #: ../e-util/e-proxy-selector.c:85
 msgid "Custom Proxy"
@@ -11552,116 +13206,277 @@ msgstr "규칙 추가"
 msgid "Edit Rule"
 msgstr "규칙 편집"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "일치: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "이 찾기 모음을 닫습니다"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "검색 결과 지우기"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "이전에 있는 해당 문구를 찾습니다"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "다음에 있는 해당 문구를 찾습니다"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "대소문자 구별(_C)"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "페이지 맨 아래에 도착했습니다. 맨 위부터 계속합니다"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "페이지 맨 위에 도착했습니다. 맨 아래부터 계속합니다"
 
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "메일"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "지울 때(_L):"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "표준"
+
+# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "무단 전제 금지"
+
+# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "비밀"
+
+# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "일급비밀"
+
+# FIXME: 이거 번역해야 돼? 커스텀 헤더에 쓰는 값의 예제.
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "혼자서만 보기"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "없음"
+
+# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "메일 내용 읽음 확인"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "회신 요청(_E)"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "다음 기한 안에(_T):"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "일"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "편리한 때에(_W)"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "메시지 배달 지연(_D)"
+
+# FIXME: bad msgid
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "다음 뒤에(_A):"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "일"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "만료 날짜 설정(_S)"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "기한(_U):"
+
+#: ../e-util/e-send-options.ui.h:25
+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):"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "일반 옵션(_R)"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "정보 추적을 위한 보낸 항목 만들기(_E)"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "배달됨(_D)"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "배달됨 및 열림(_V)"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "모든 정보(_A)"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "보낸 항목 자동으로 삭제(_U)"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "상태 추적"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "열면(_W):"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "거부당하면(_N):"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "완성되면(_M):"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "받아들여지면(_P):"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "반송 메일 알림"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "상태 추적(_T)"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "형태:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 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:1301
+#: ../e-util/e-source-config.c:1311
 msgid "Refresh every"
 msgstr "폴더 새로 고침 주기:"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr "보안 연결 사용"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr "SSL 인증서 신뢰 해제(_T)"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1473
 msgid "User"
 msgstr "사용자"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "대상(_D)"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "대상 선택"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "알 수 없음 (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(제안 없음)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "더 보기..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "사전에 \"%s\" 추가"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "모두 무시"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "맞춤법 제안"
 
@@ -11676,10 +13491,6 @@ msgstr ""
 "\"{0}\" 안에 파일이 이미 있습니다. 이 파일을 덮어 쓰면 기존 내용을 잃어버리"
 "게 됩니다."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "바꾸기(_R)"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "\"{0}\" 파일을 저장할 수 없습니다."
@@ -11762,34 +13573,34 @@ 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:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "추가하려면 누르십시오"
 
 # tooltip
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "선택한 열 이름을 맨 위로 옮깁니다"
 
 # tooltip
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "선택한 열 이름을 한 줄 위로 옮깁니다"
 
 # tooltip
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "선택한 열 이름을 한 줄 아래로 옮깁니다"
 
 # tooltip
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "선택한 열 이름을 맨 아래로 옮깁니다"
 
 # tooltip
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "모든 열 이름을 선택합니다"
 
@@ -11817,9 +13628,71 @@ msgstr "필드 표시"
 msgid "Choose the order of information to appear in the message list."
 msgstr "메시지 목록에 나타날 정보의 순서를 선택하십시오."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "열 추가"
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:367
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "정렬(_S)..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "모으기(_G)..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "표시할 필드(_F)..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "모두 지우기(_A)"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "뷰에서 필드 표시(_S)"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "증가"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "감소"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "항목 모음 기준"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "뷰에서 필드 표시(_F)"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "다음 기준"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "뷰에서 필드 표시(_N)"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "뷰에서 필드 표시(_V)"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "정렬"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "모두 지우기"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "항목 정렬 기준"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -11829,6 +13702,10 @@ msgstr ""
 "표에 열을 추가하려면, 열을 표시할\n"
 "위치에 열을 끌어 놓으십시오."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "열 추가"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -11841,71 +13718,67 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d개 항목)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "현재 뷰 사용자 설정하기"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "오름차순 정렬(_A)"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "내림차순 정렬(_D)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "정렬 안함(_U)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "이 범위로 묶음(_F)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "상자로 묶음(_B)"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "열 제거(_C)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "열 추가(_O)..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "정렬(_L)"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "자동 맞춤(_E)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "열 형식(_S)..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "현재 보기 사용자 설정(_M)..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "정렬 기준(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "모두 선택"
 
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "입력기"
-
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
 #: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
@@ -11913,6 +13786,32 @@ msgstr "입력기"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "표준 시간대를 선택하십시오"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"왼쪽 마우스 단추로 지도에서 특정 지역을 확대한 다음 표준 시간대를 선택하십시"
+"오.\n"
+"오른쪽 마우스 단추로 축소합니다."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "표준 시간대"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "선택(_S)"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "표준 시간대 드롭다운 콤보 상자"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "URL을 열려면 여기를 누르십시오"
@@ -11921,125 +13820,122 @@ msgstr "URL을 열려면 여기를 누르십시오"
 msgid "Enter a URL here"
 msgstr "여기 URL 입력"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "에볼루션 소스 보기"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "표시 이름"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "표시"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "신상 정보"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "링크를 클립보드로 복사합니다"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "웹 브라우저에서 링크 열기"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "전자메일 주소 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
-msgstr "그림 복사(_C)"
+msgstr "이미지 복사(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
-msgstr "그림을 클립보드로 복사합니다"
+msgstr "이미지를 클립보드로 복사합니다"
+
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "이미지 저장(_I)..."
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "이미지를 파일에 저장합니다"
+
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
 msgid "Select all text and images"
-msgstr "모든 텍스트와 그림을 선택합니다"
+msgstr "모든 텍스트와 이미지를 선택합니다"
 
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1004
 #, c-format
 msgid "Click to call %s"
 msgstr "%s에게 호출하려면 누르십시오"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1006
 msgid "Click to hide/unhide addresses"
 msgstr "주소를 감추려면/보이려면 누르십시오"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1017
 #, c-format
-msgid "Click to open %s"
-msgstr "%s URL을 열려면 누르십시오"
+msgid "Go to the section %s of the message"
+msgstr "메시지의 %s 부분으로 이동합니다"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "그림 저장(_I)..."
+#: ../e-util/e-web-view.c:1019
+msgid "Go to the beginning of the message"
+msgstr "메시지의 처음으로 이동합니다"
 
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "그림을 파일에 저장합니다"
+#: ../e-util/e-web-view.c:1023
+#, c-format
+msgid "Click to open %s"
+msgstr "%s URL을 열려면 누르십시오"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../e-util/e-web-view.c:2898
+#: ../e-util/e-web-view.c:2941
 msgid "Copying image to clipboard"
-msgstr "그림을 클립보드로 복사하는 중"
+msgstr "이미지를 클립보드로 복사"
 
-#: ../e-util/e-web-view.c:3086
+#: ../e-util/e-web-view.c:3129
 msgid "Save Image"
-msgstr "그림 저장"
+msgstr "이미지 저장"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../e-util/e-web-view.c:3122
+#: ../e-util/e-web-view.c:3165
 #, c-format
 msgid "Saving image to '%s'"
-msgstr "그림을 '%s'에 저장하는 중"
+msgstr "이미지를 '%s'에 저장"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../e-util/e-widget-undo.c:429
 msgid "Undo 'Insert text'"
 msgstr "'텍스트 입력' 실행 취소"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../e-util/e-widget-undo.c:431
 msgid "Redo 'Insert text'"
 msgstr "'텍스트 입력' 다시 실행"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../e-util/e-widget-undo.c:445
 msgid "Undo 'Delete text'"
 msgstr "'텍스트 삭제' 실행 취소"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../e-util/e-widget-undo.c:447
 msgid "Redo 'Delete text'"
 msgstr "'텍스트 삭제' 다시 실행"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%Y년 %B %d일"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "달력: %s에서 %s까지"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "에볼루션 달력 항목"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "에볼루션 소스 보기"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "표시 이름"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "표시"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "신상 정보"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "날짜가 빠졌습니다."
@@ -12100,13 +13996,95 @@ msgstr "값이 빠졌습니다."
 msgid "One or more values cannot be empty."
 msgstr "한 개 이상 값을 써야 하고 비워 놓으면 안 됩니다."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "현재 시각"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "지정하는 시각"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "현재 시각까지의 상대적인 시간"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+msgid "seconds"
+msgstr "초"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "주"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "달"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "연도"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "전에"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "앞으로"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "다음 메일에 대한 필터 표시:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "필터 규칙(_F)"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "비교할 시각:"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"필터링하는 현재 시각을 기준으로\n"
+"메시지 시각을 비교합니다."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"지정한 날짜의 오전 12:00를 기준으로\n"
+"메시지 시각을 비교합니다."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"필터링하는 시각까지 얼마나 지났나를 기준으로\n"
+"메시지 시각을 비교합니다."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "테이블 셀"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "하위 창 팝업"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "이 셀 편집 시작"
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "셀 토글"
 
@@ -12120,10 +14098,6 @@ msgstr "이 셀이 들어 있는 ETree의 행 늘리기"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "이 셀이 들어 있는 ETree의 행 줄이기"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "테이블 셀"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "누르기"
@@ -12136,6 +14110,14 @@ msgstr "정렬"
 msgid "Save Current View"
 msgstr "현재 뷰 저장"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "새 뷰 만들기(_C)"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "현재 뷰 바꾸기(_R)"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "바뀐 내용을 저장하시겠습니까?"
@@ -12158,11 +14140,11 @@ msgstr "이 서명을 구분할 수 있는 고유한 이름을 입력하십시
 
 #: ../e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
-msgstr "그림을 클립보드에 복사할 수 없습니다."
+msgstr "이미지를 클립보드에 복사할 수 없습니다."
 
 #: ../e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
-msgstr "그림을 저장할 수 없습니다."
+msgstr "이미지를 저장할 수 없습니다."
 
 #: ../e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
@@ -12172,6 +14154,26 @@ msgstr "서명을 읽어들일 수 없습니다."
 msgid "Could not save signature."
 msgstr "서명을 저장할 수 없습니다."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"에볼루션은 개인 정보 관리 프로그램으로 메일, 달력, 주소록 기능이 통합되어 있"
+"습니다."
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"에볼루션은 광범위한 산업 표준 데이터 포맷과 정보 교환용 네트워크 프로토콜을 "
+"표준 준수와 보안을 염두에 두고 지원합니다. 또 에볼루션은 \"익스체인지 웹 서비"
+"스\"(EWS) 확장 기능을 이용해 마이크로소프트 익스체인지와 연동할 수도 있습니"
+"다."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -12180,11 +14182,6 @@ msgstr "OAuth2"
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr "이 옵션을 사용하면 OAuth 2.0 토큰으로 서버에 연결합니다"
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "인증 결과 코드가 잘못되었습니다(%d)"
-
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
@@ -12239,100 +14236,116 @@ msgstr[0] "메시지 %d개를 저장하는 중"
 msgid "Invalid folder URI '%s'"
 msgstr "잘못된 폴더 URI '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "메일 전송 서비스가 없습니다."
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "나가는 필터를 적용하는데 실패했습니다: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"%s에 추가하는데 실패했습니다: %s\n"
-"대신에 로컬의 '보낸 편지함'에 추가합니다."
-
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:774
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "로컬의 '보낸 편지함' 폴더에 추가하는데 실패했습니다: %s"
-
-# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/e-mail-session-utils.c:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "메시지 보내는 중입니다"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1057
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "받은 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "임시 보관함"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "보낼 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "보낸 편지함"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "서식"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "사용자가 취소한 동작"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s 인증 실패"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "UID '%s'에 대해 데이터 소스가 없습니다"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "대상 주소를 입력하지 않았으므로 메시지 전달을 취소합니다."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "사용할 계정이 없으므로 메시지 전달을 취소합니다."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../libemail-engine/e-mail-session.c:2360
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "'%s' 대기하는 중"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "메일 전송 서비스가 없습니다."
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../libemail-engine/e-mail-session-utils.c:629
+#: ../libemail-engine/mail-ops.c:718
+#, c-format
+msgid "Posting message to '%s'"
+msgstr "메시지를 '%s'에 올리는 중"
+
+#: ../libemail-engine/e-mail-session-utils.c:666
+#: ../libemail-engine/mail-ops.c:754
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "나가는 필터를 적용하는데 실패했습니다: %s"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../libemail-engine/e-mail-session-utils.c:696
+#: ../libemail-engine/e-mail-session-utils.c:731
+#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#, c-format
+msgid "Storing sent message to '%s'"
+msgstr "보낸 메시지를 '%s'에 저장하는 중"
+
+#: ../libemail-engine/e-mail-session-utils.c:720
+#: ../libemail-engine/mail-ops.c:802
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"%s에 추가하는데 실패했습니다: %s\n"
+"대신에 로컬의 '보낸 편지함'에 추가합니다."
+
+#: ../libemail-engine/e-mail-session-utils.c:750
+#: ../libemail-engine/mail-ops.c:830
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "로컬의 '보낸 편지함' 폴더에 추가하는데 실패했습니다: %s"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../libemail-engine/e-mail-session-utils.c:952
+#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+msgid "Sending message"
+msgstr "메시지 보내는 중입니다"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12374,7 +14387,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "'%s'에서 메일 가져오는 중"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:748
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12387,61 +14400,67 @@ msgstr ""
 "원래 오류는: %s"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d개 중에서 %1$d번째 메시지를 보내는 중"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1041
 #, 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:975
+#: ../libemail-engine/mail-ops.c:1047
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "완료."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1163
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "메시지를 '%s'에 옮기는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "메시지를 '%s'에 복사하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1283
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' 폴더를 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메시지를 비우고 내용을 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1487
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중"
 
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../libemail-engine/mail-ops.c:1579
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "'%s'의 폴더 변경 사항을 처리하는 중"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12500,50 +14519,39 @@ msgstr "온라인 계정 열기(_O)"
 msgid "This account was created through the Online Accounts service."
 msgstr "이 계정은 온라인 계정 서비스를 통해 만들었습니다."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "순서 초기화(_R)"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "계정 이름을 끌어 놓으면 정렬 순서를 바꿀 수 있습니다."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "기본값(_F)"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1234
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "사용"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "계정 이름"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3601
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "기본값"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "전자메일 주소를 제공하지 않음"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "전자메일 주소에 도메인이 없음"
 
-#: ../mail/e-mail-backend.c:841
-msgid "Unknown background operation"
-msgstr "알 수 없는 백그라운드 동작"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:859
-#: ../shell/e-shell-window-actions.c:866 ../shell/e-shell-window-actions.c:873
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "이 창을 닫습니다"
 
@@ -12557,23 +14565,23 @@ msgid "Go _Back"
 msgstr "뒤로 이동(_B)"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "살펴보기 넘어가기(_S)"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "에볼루션 계정 도우미"
 
-#: ../mail/e-mail-config-assistant.c:935
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "자세한 정보 바꾸기(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "지원하는 방식 확인"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12587,7 +14595,7 @@ msgstr ""
 "\n"
 "설정을 저장하려면 \"적용\"을 누르십시오."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "완료"
 
@@ -12616,63 +14624,72 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "답장하려는 메시지가 있는 폴더에 답장을 저장(_A)"
 
 #: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "모음 폴더(_V):"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr "메시지를 모을 폴더를 선택하십시오."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "기본값 복원(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "휴지통으로 실제 폴더 사용(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "삭제한 메시지의 폴더를 선택하십시오."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "정크 메시지 용도로 실제 폴더 사용(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "정크 메시지의 폴더를 선택하십시오."
 
 # 진행 상태가 아니라 설정 창의 제목, "~하는 중"으로 번역하지 말 것
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "메시지 작성"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "항상 참조(CC) (_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "항상 숨은 참조(BCC) (_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "메시지 내용 읽음 확인"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "메시지 수신 확인 보내기(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "사용 안 함"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "항상"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "메시지마다 물어보기"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "기본값"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12681,13 +14698,13 @@ msgstr ""
 "아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"추가\" 필드는 메일"
 "을 보낼 때 정보를 추가하지 않고 싶으면 채우지 않아도 됩니다."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "계정 정보"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12695,36 +14712,40 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\"."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "필요 정보"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "전체 이름(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "전자메일 주소(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "추가 정보"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "답장 주소(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "새 서명 추가(_W)..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr "입력한 메일 주소에 따라 메일 서버 정보 찾기(L)"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "계정 상세 정보를 찾아보는 중..."
 
@@ -12737,7 +14758,7 @@ msgstr "새 메일 확인"
 msgid "Check for _new messages every"
 msgstr "새 메일 확인(_N), 매"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
@@ -12745,99 +14766,107 @@ msgstr "받기 옵션"
 msgid "Receiving Email"
 msgstr "메일 받기"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
+#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "일반"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "모임 요청에 서명하지 않기(Outlook 호환)(_D)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 키 ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "서명 알고리즘(_G):"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "이 계정으로 보내는 메시지는 항상 서명(_W)"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서 언제나 암호화(_M)"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "암호화할 때 내 키 모음에 들어 있는 키는 언제나 신뢰(_T)"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "보안 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "서명 인증서(_N):"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "선택"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:962
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "지우기(_C)"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "서명 알고리즘(_A):"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "이 계정으로 보내는 메시지는 항상 서명"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "암호화 인증서:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "이 계정으로 보내는 메시지는 항상 암호화"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서 언제나 암호화"
 
@@ -12845,7 +14874,7 @@ msgstr "암호화한 메일을 보낼 때 자신에 대해서 언제나 암호
 msgid "Sending Email"
 msgstr "메일 보내기"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "서버 종류(_T):"
 
@@ -12857,52 +14886,52 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "다음은 메일을 읽고 쓸 때 사용할 설정 요약입니다."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "개인 상세 정보"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "전체 이름:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "전자메일 주소:"
 
 # 설정 tab, 상태가 아님
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "받기"
 
 # 설정 tab, 상태가 아님
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "보내기"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "서버 종류:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "서버:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "사용자이름:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "보안:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "계정 요약"
 
@@ -12910,48 +14939,104 @@ msgstr "계정 요약"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "에볼루션 메일 설정 도우미입니다.\n"
 "\n"
-"시작하려면 \"계속\"을 누르십시오."
+"시작하려면 \"다음\"을 누르십시오."
 
 #: ../mail/e-mail-config-welcome-page.c:166
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "환영합니다"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "주소록에 추가(_A)..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "이 주소로(_T)"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "이 주소에서(_F)"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "답장 보내기(_R)..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "답장 메시지를 이 주소로 보냅니다"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "검색 폴더 만들기(_F)"
 
-#. 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:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "폴더 만들기"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "폴더 만들 곳을 지정하십시오:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "만들기(_R)"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "폴더 이름(_N):"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+msgctxt "ffe"
+msgid "Answered"
+msgstr "응답함"
+
+#: ../mail/e-mail-free-form-exp.c:227
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "삭제함"
+
+#: ../mail/e-mail-free-form-exp.c:228
+msgctxt "ffe"
+msgid "Draft"
+msgstr "임시 보관함"
+
+#: ../mail/e-mail-free-form-exp.c:229
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "플래그"
+
+#: ../mail/e-mail-free-form-exp.c:230
+msgctxt "ffe"
+msgid "Seen"
+msgstr "봤음"
+
+#: ../mail/e-mail-free-form-exp.c:231
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "첨부"
+
+#: ../mail/e-mail-free-form-exp.c:479
+msgctxt "ffe"
+msgid "no"
+msgstr "아니요"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr "거짓"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "정크메일 필터링 소프트웨어:"
 
@@ -12959,32 +15044,32 @@ msgstr "정크메일 필터링 소프트웨어:"
 msgid "_Label name:"
 msgstr "레이블 이름(_L):"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "중요(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "업무(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "개인(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "할 일(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "나중에(_L)"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Add Label"
 msgstr "레이블 추가"
 
@@ -13005,38 +15090,38 @@ msgid "Color"
 msgstr "색"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "선택한 헤더를 맨 위로 옮깁니다"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "선택한 헤더를 한 줄 위로 옮깁니다"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "선택한 헤더를 한 줄 아래로 옮깁니다"
 
 # tooltip
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "선택한 헤더를 맨 아래로 옮깁니다"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "모든 헤더 선택"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "헤더 이름"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "헤더 값"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
 msgid "Headers"
 msgstr "헤더"
 
@@ -13045,663 +15130,723 @@ msgstr "헤더"
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$d페이지"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "폴더로 복사"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "복사(_O)"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Move to Folder"
 msgstr "폴더로 이동"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+msgid "Copy to Folder"
+msgstr "폴더로 복사"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "이동(_M)"
 
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "복사(_O)"
+
 # 주의: check button에 사용. 문장으로 번역하지 말 것.
 # 주의: 원문 잘못이므로 점 생략.
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "다시 묻지 않기(_D)"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것.
 # 주의: 원문 잘못이므로 점 생략.
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "메일링 리스트의 경우 Reply-To: 무시(_A)"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "메시지를 가져오는데 실패했습니다:"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "'%s' 메시지를 가져오는 중"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "보낸 사람을 주소록에 추가(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "보낸 사람을 주소록에 추가합니다"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr "모음(_A)..."
+
+# tooltip
+#: ../mail/e-mail-reader.c:1970
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "선택한 메시지를 계정의 모음 폴더로 옮깁니다"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "정크메일 검사(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "선택한 메시지를 정크메일인지 필터링합니다"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "선택한 메시지를 다른 폴더로 복사합니다"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "메시지 삭제(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "선택한 메시지를 지운 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "메일링 리스트에 대한 필터 규칙 만들기(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "이 메일링 리스트에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "받는 사람에 대한 필터 규칙 만들기(_R)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr "이 받는 사람에게 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "보낸 사람에 대한 필터 규칙 만들기(_N)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr "이 보낸 사람이 보낸 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "제목에 대한 필터 규칙 만들기(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr "이 제목으로 도착한 메시지를 필터 규칙으로 만듭니다"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "필터 적용(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "선택한 메시지에 필터 규칙을 적용합니다"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "메시지에서 찾기(_F)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr "표시한 메시지의 본문에서 텍스트를 찾습니다"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "플래그 지우기(_C)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "선택한 메시지에서 추가 작업 플래그를 지웁니다"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "플래그 완료(_F)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "선택한 메시지의 추가 작업을 마침으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "추가 작업(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "선택한 메시지에 추가 작업을 표시합니다"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "첨부(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "선택한 메시지를 다른 사람에게 첨부하여 전달합니다"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "첨부로 전달(_A)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "포함(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 msgid "Forward the selected message in the body of a new message"
 msgstr "선택한 메시지를 새 메시지의 본문으로 전달합니다"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "포함해서 전달(_I)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "인용(_Q)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr "선택한 메시지를 답장처럼 인용하여 전달합니다"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "인용해서 전달(_Q)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
-msgstr "그림 읽어들이기(_L)"
+msgstr "이미지 읽어들이기(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
-msgstr "HTML 메일의 그림을 강제로 읽어들입니다"
+msgstr "HTML 메일의 이미지를 강제로 읽어들입니다"
+
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr "하위 스레드 무시(_I)"
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr "하위 스레드의 새 메일을 자동으로 읽은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+msgid "_Ignore Thread"
+msgstr "스레드 무시(_I)"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr "이 스레드의 새 메일을 자동으로 읽은 것으로 표시합니다"
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "중요(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "선택한 메시지를 중요한 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "정크메일(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "선택한 메시지를 정크메일로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "정크메일 아님(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "선택한 메시지를 정크메일이 아닌 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "읽기(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "선택한 메시지를 읽은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Subthread"
+msgstr "하위 스레드 무시하지 않기(_I)"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr "하위 스레드의 새 메일을 자동으로 읽은 것으로 표시하지 않습니다"
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr "스레드 무시하지 않기(_I)"
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr "이 스레드의 새 메일을 자동으로 읽은 것으로 표시하지 않습니다"
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "중요하지 않음(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "선택한 메시지를 중요하지 않은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "읽기 취소(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "선택한 메시지를 읽지 않은 것으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "새 메시지로 편집(_E)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "선택한 메시지를 메일 작성에서 열어서 편집합니다"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "새 메시지 작성(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "메일 메시지를 작성하는 창을 엽니다"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "새 창에서 열기(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "선택한 메시지를 새 창에서 엽니다"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "선택한 메시지를 다른 폴더로 옮깁니다"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "다음 메시지(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "다음의 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "다음 중요한 메시지(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "다음의 중요한 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "다음 글타래(_T)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "다음의 글타래를 표시합니다"
 
 # 주의: 아래의 Previous Unread Message와 같은 형태로 번역
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "읽지 않은 다음 메시지(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "다음의 읽지 않은 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "이전 메시지(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "이전의 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "이전의 중요한 메시지(_E)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "이전의 중요한 메시지를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "이전 글타래(_H)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "이전 메시지를 표시합니다"
 
 # 주의: 위의 Next Unread Message와 같은 형태로 번역
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "읽지 않은 이전 메시지(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "이전의 읽지 않은 메시지를 표시합니다"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "이 메시지를 인쇄합니다"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "인쇄할 메시지를 미리 봅니다"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "수신만 변경(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "선택한 메시지의 수신자를 누군가로 돌립니다(반송합니다)"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "첨부 제거(_V)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "첨부 제거"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "중복 메시지 제거(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "선택한 메시지를 중복으로 표시합니다"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "전체에 답장(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "선택한 메시지의 받는 사람 모두에게 답장을 작성합니다"
 
 # List는 메일링 리스트를 말함.
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "리스트에 답장(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "선택한 메시지의 메일링 리스트로 답장을 작성합니다"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 답장(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr "이 메시지를 보낸사람에게 답장을 작성합니다"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "메일함으로 저장(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "선택한 메시지를 메일함(mbox) 파일로 저장합니다"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "메시지 원본(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "메시지의 메일 원본을 표시합니다"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "메시지 되살리기(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "선택한 메시지를 되살립니다"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "보통 크기(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "글자를 원래 크기로 맞춥니다"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "확대(_Z)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "글자 크기를 키웁니다"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "글자 크기를 줄입니다"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "만들기(_A)"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "문자 인코딩(_A)"
 
 # inline, attached, quoted 따위
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "전달 방식(_O)"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "그룹 답장(_G)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "이동(_G)"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "표시(_K)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "메시지(_M)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "확대/축소(_Z)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "메일링 리스트에 대한 검색 폴더 만들기(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "이 메일링 리스트에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "받는 사람에 대한 검색 폴더 만들기(_T)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "이 받는 사람에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "보낸 사람에 대한 검색 폴더 만들기(_D)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "이 보낸 사람에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "제목에 대한 검색 폴더 만들기(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "이 제목에 대한 검색 폴더를 만듭니다"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "중요하지 않은 것으로 표시(_M)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "캐릿 모드(_C)"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "표시하는 메시지의 본문 안에 깜박이는 커서를 표시합니다"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "모든 메시지 헤더(_H)"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "메일의 모든 헤더와 같이 메시지를 표시합니다"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3020
 msgid "Retrieving message"
 msgstr "메시지 가져오기"
 
-#: ../mail/e-mail-reader.c:3771
+#: ../mail/e-mail-reader.c:4028
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "전달(_F)"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:4029
 msgid "Forward the selected message to someone"
 msgstr "선택한 메시지를 다른 사람에게 전달합니다"
 
-#: ../mail/e-mail-reader.c:3791
+#: ../mail/e-mail-reader.c:4048
 msgid "Group Reply"
 msgstr "그룹 답장"
 
 # tooltip
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4049
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "메일링 리스트로 답장하거나, 아니면 모든 수신자에게 답장합니다"
 
-#: ../mail/e-mail-reader.c:3858 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4115 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "삭제"
 
-#: ../mail/e-mail-reader.c:3870
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4127
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "다음"
 
-#: ../mail/e-mail-reader.c:3874
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "이전"
 
-#: ../mail/e-mail-reader.c:3883 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4140 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "답장"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "다시 경고하지 않기"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:556
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1806
+#: ../modules/cal-config-google/e-google-chooser.c:1843
+#: ../plugins/face/face.c:170 ../shell/e-shell.c:861 ../shell/e-shell.c:882
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
+#: ../mail/e-mail-reader-utils.c:1043
+msgid "Marking thread to be ignored"
+msgstr "무시할 스레드 표시"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Unmarking thread from being ignored"
+msgstr "무시할 스레드 표시 해제"
+
+#: ../mail/e-mail-reader-utils.c:1051
+msgid "Marking subthread to be ignored"
+msgstr "무시할 하위 스레드 표시"
+
+#: ../mail/e-mail-reader-utils.c:1055
+msgid "Unmarking subthread from being ignored"
+msgstr "무시할 하위 스레드 표시 해제"
+
 # 주의: 다른 메시지의 일부로 쓰인다. 문장 또는 "-중"과 같이 번역하지 말 것.
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1290
 msgid "Printing"
 msgstr "인쇄"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1525
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13711,7 +15856,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "'%s' 폴더에 중복 메시지가 %u개 있습니다. 정말로 삭제하시겠습니까?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2355
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "메시지 저장"
@@ -13721,13 +15866,13 @@ 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:2047
+#: ../mail/e-mail-reader-utils.c:2376
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "메시지"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장 또는 "-중"과 같이 번역하지 말 것.
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2749
 msgid "Parsing message"
 msgstr "메시지 파싱"
 
@@ -13739,11 +15884,21 @@ msgstr "메시지에 내용 텍스트가 없습니다."
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메시지 플래그"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s 인증 실패"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "UID '%s'에 대해 데이터 소스가 없습니다"
+
 #. Note to translators: this is the attribution string used
 #. * 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:1454
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13752,26 +15907,27 @@ msgstr ""
 "${TimeZone}, ${Sender}:"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 사람"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3107
 msgid "Posting destination"
 msgstr "게시물 수신자"
 
 # post -> 게시, Microsoft Office XP 참고
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3112
 msgid "Choose folders to post the message to."
 msgstr "메시지를 올릴 폴더를 선택하십시오."
 
@@ -13779,284 +15935,6 @@ msgstr "메시지를 올릴 폴더를 선택하십시오."
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "점수 조정"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "모든 헤더"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "색 지정"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "점수 지정"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "숨긴 참조"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "삑 소리"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "참조"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "완료 날짜"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "받은 날짜"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "보낸 날짜"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "삭제함"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "임시 보관함"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "표현"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "추가 작업"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "전달"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "중요"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "정크메일 테스트"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "정크메일"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "레이블"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "메일링 리스트"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "모두"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "메시지 본문"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "메시지 헤더"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "메시지 위치"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "메시지가 정크메일"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "메시지가 정크메일 아님"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "프로그램에 파이프 입력"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "사운드 재생"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "읽음"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "받는 사람"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "정규식"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "답장"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "프로그램 실행"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "점수"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "보낸 사람 혹은 받는 사람"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "보낸 사람"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "레이블 설정"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "상태 설정"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "크기(kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "메일 온 계정"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "특정 헤더"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "처리 중지"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "색 설정 없애기"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "상태 설정 없애기"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "끝나지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "없음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "단어 들어 있지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "리턴하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "비슷한 소리 아님"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "시작하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "끝남"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "존재함"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "단어 들어 있음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "플래그 지정"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "뒤 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "앞 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "플래그 지정 아님"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "설정 아님"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "설정"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "더 큰 값 리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "더 작은 값 리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "비슷한 소리"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "시작함"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -14100,13 +15978,9 @@ msgstr "폴더 속성"
 msgid "<click here to select a folder>"
 msgstr "<폴더를 고를려면 여기를 누르십시오>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "만들기(_R)"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "폴더 이름(_N):"
+#: ../mail/em-folder-selector.c:398
+msgid "Create a new folder"
+msgstr "새 폴더를 만들기"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -14118,31 +15992,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "메일 폴더 트리"
 
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메시지를 맨 위의 저장고에 넣을 수 없습니다"
@@ -14153,26 +16027,18 @@ msgstr "메시지를 맨 위의 저장고에 넣을 수 없습니다"
 msgid "UNMATCHED"
 msgstr "해당 없음"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "폴더 옮기기"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "폴더 복사"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "폴더 만들기"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "폴더 만들 곳을 지정하십시오:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "구독(_S)"
@@ -14186,7 +16052,7 @@ msgid "Subscribe To _All"
 msgstr "모든 항목에 구독(_A)"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
@@ -14225,7 +16091,7 @@ msgstr "구독(_B)"
 
 # tooltip
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Unsubscribe from the selected folder"
 msgstr "선택한 폴더에서 구독을 중지합니다"
 
@@ -14253,8 +16119,8 @@ msgid "Refresh the folder list"
 msgstr "폴더 목록을 새로 고칩니다"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
@@ -14264,7 +16130,7 @@ msgid "Stop the current operation"
 msgstr "현재 동작을 중지합니다"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "중지(_S)"
 
@@ -14278,16 +16144,11 @@ 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:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "이 메시지 다시 보지 않기(_D)"
-
 #: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "메시지 필터"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:983
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -14300,34 +16161,348 @@ msgstr "폴더 검색(_F)"
 msgid "Add Folder"
 msgstr "폴더 추가"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "폴더 소스 검색"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "소스 폴더가 바뀔 때마다 자동으로 업데이트(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "모든 로컬 폴더"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "모든 활성화한 원격 폴더"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "모든 로컬 폴더와 활성화한 원격 폴더"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "지정한 폴더"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "하위 폴더 포함"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "보낸 사람"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "시작함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "시작하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "끝남"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "끝나지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "비슷한 소리"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "비슷한 소리 아님"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "받는 사람"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "참조"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "숨긴 참조"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "보낸 사람 혹은 받는 사람"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "단어 들어 있음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "단어 들어 있지 않음"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "특정 헤더"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "존재함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "없음"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "메시지 본문"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "표현"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Free Form Expression"
+msgstr "자유 형식 표현"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "보낸 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "앞 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "뒤 날짜"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "받은 날짜"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "레이블"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "점수"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "크기(kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "답장"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "중요"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "읽음"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "정크메일"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "추가 작업"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "플래그 지정"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+msgstr "플래그 지정 아님"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "Completed On"
+msgstr "완료 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is set"
+msgstr "설정"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
+msgid "is not set"
+msgstr "설정 아님"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Mailing list"
+msgstr "메일링 리스트"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Regex Match"
+msgstr "정규식"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Header"
+msgstr "메시지 헤더"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Source Account"
+msgstr "메일 온 계정"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "Pipe to Program"
+msgstr "프로그램에 파이프 입력"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:54
+msgid "returns"
+msgstr "리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:55
+msgid "does not return"
+msgstr "리턴하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns greater than"
+msgstr "더 큰 값 리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/filtertypes.xml.in.h:57
+msgid "returns less than"
+msgstr "더 작은 값 리턴"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Junk Test"
+msgstr "정크메일 테스트"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is Junk"
+msgstr "메시지가 정크메일"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Message is not Junk"
+msgstr "메시지가 정크메일 아님"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+msgid "Message Location"
+msgstr "메시지 위치"
+
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
+msgid "Match All"
+msgstr "모두"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Stop Processing"
+msgstr "처리 중지"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Set Label"
+msgstr "레이블 설정"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Color"
+msgstr "색 지정"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Unset Color"
+msgstr "색 설정 없애기"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Score"
+msgstr "점수 지정"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Adjust Score"
+msgstr "점수 조정"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Set Status"
+msgstr "상태 설정"
+
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "삭제함"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Unset Status"
+msgstr "상태 설정 없애기"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Beep"
+msgstr "삑 소리"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Play Sound"
+msgstr "사운드 재생"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Run Program"
+msgstr "프로그램 실행"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Forward to"
+msgstr "전달"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "ELM 데이터 가져오기"
@@ -14341,54 +16516,80 @@ msgid "Import mail from Elm."
 msgstr "ELM에서 메일을 가져옵니다."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "대상 폴더(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "폴더 선택"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "제목"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "보낸 사람"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../mail/importers/evolution-mbox-importer.c:568
 #: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버클리 메일박스(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "버클리 메일박스 형식 폴더 가져오기"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "주소 %d개"
+
+#: ../mail/importers/kmail-importer.c:354
+msgid "Evolution KMail importer"
+msgstr "에볼루션 KMail 가져오기"
+
+#: ../mail/importers/kmail-importer.c:355
+msgid "Import mail and contacts from KMail."
+msgstr "KMail에서 메일과 연락처를 가져옵니다."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+msgid "Trash"
+msgstr "지운 메시지"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
+#: ../mail/importers/mail-importer.c:61
+msgid "Importing mail and contacts from KMail"
+msgstr "ELM에서 메일과 연락처를 가져옵니다."
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "'%s' 가져오는 중입니다"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
@@ -14476,119 +16677,118 @@ msgid "For_mat messages in HTML"
 msgstr "메시지를 HTML 형식으로(_M)"
 
 #: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
-msgstr "자동으로 이모티콘 그림 넣기(_E)"
+msgid "Automatically insert _emoticons"
+msgstr "자동으로 이모티콘 넣기(_E)"
 
-# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
 #: ../mail/mail-config.ui.h:10
+msgid "Use Unicode characters for smile_ys"
+msgstr "이모티콘에 유니코드 문자 사용(_Y)"
+
+# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "항상 내용 읽음 확인 요청(_D)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "파일 이름을 아웃룩/지메일 방식으로 인코딩(_O)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
+msgid "Send messages through Outbo_x folder"
+msgstr "메시지를 보낼 편지함에 저장(_X)"
+
+#: ../mail/mail-config.ui.h:14
+msgid "Number of characters for word w_rapping:"
+msgstr "단어 단위 줄바꿈 문자 수(_R):"
+
+#: ../mail/mail-config.ui.h:15
 msgid "Ch_aracter encoding:"
 msgstr "문자 인코딩(_A):"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:16
 msgid "Replies and Forwards"
 msgstr "답장 및 전달"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:17
 msgid "_Reply style:"
 msgstr "답장 모양(_R):"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:18
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:19
 msgid "Start _typing at the bottom on replying"
 msgstr "답장할 때 맨 아래부터 입력 시작(_T)"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:20
 msgid "_Keep signature above the original message on replying"
 msgstr "답장할 때 원문 위에 서명 놓기(_K)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:21
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "메일링 리스트에서 Reply-To: 무시(_N)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:22
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "그룹 답장은(가능한 경우) 메일링 리스트에만 답장(_U)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:23
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "원문이 서명되어 있으면 디지털 서명하기(PGP 또는 S/MIME)(_S)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "첨부"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "포함(Outlook 방식)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "인용"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "인용하지 않기"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "포함"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:30
 msgid "Sig_natures"
 msgstr "서명(_N)"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:31
 msgid "Signatures"
 msgstr "서명"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "_Languages"
 msgstr "언어(_L)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Languages Table"
 msgstr "언어 표"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:34
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "이 언어 목록은 사전을 설치한 언어만 들어 있습니다."
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Check spelling while I _type"
 msgstr "입력할 때 맞춤법 검사(_T)"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "맞춤법이 틀린 글자의 색(_M):"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "색을 고르십시오"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "맞춤법 검사"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14597,256 +16797,285 @@ msgstr ""
 "문을 합니다:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 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:41
+#: ../mail/mail-config.ui.h:42
 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:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a _private reply to a mailing list message"
 msgstr "메일링 리스트 메시지에 개인 답장 보내기(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a reply to a large _number of recipients"
 msgstr "여러 명의 수신자에게 답장을 보내기(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "메일링 리스트에서 개인 답장을 리스트로 보내기 허용(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "메일 주소로 입력하지 않은 수신자에게 메시지 보내기(_R){0}"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:52
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "단축키로 (Ctrl+Enter) 메시지 보내기(_K)"
+
+#: ../mail/mail-config.ui.h:53
 msgid "Confirmations"
 msgstr "확인"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
 msgid "Use for Folders"
 msgstr "폴더에 대해 사용"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
 msgid "A_dd"
 msgstr "추가(_D)"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Re_move"
 msgstr "제거(_M)"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Use for Recipients"
 msgstr "받는 사람에 대해 사용"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:836
 msgid "Account"
 msgstr "계정"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Send account overrides"
 msgstr "보내기 계정 따로 지정"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
 "recipients can contain partial addresses or names. The name and the address "
 "parts are compared separately."
-msgstr "폴더와 받는 사람에 대해 보내기 계정으로 어떤 계정을 사용할지 따로 지정합니다. 기본값 보내기 계정 대신에 사용합니다. 받는 사람 목록에는 메일 주소나 이름의 일부만 들어 있을 
수도 있습니다. 이름과 주소는 따로따로 확인됩니다."
+msgstr ""
+"폴더와 받는 사람에 대해 보내기 계정으로 어떤 계정을 사용할지 따로 지정합니"
+"다. 기본값 보내기 계정 대신에 사용합니다. 받는 사람 목록에는 메일 주소나 이름"
+"의 일부만 들어 있을 수도 있습니다. 이름과 주소는 따로따로 확인됩니다."
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "_Folder override has precedence over Recipient override"
 msgstr "폴더 따로 지정이 받는 사람 따로 지정보다 우선 순위 높음(_F)"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Send Account"
 msgstr "보내기 계정"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Start up"
 msgstr "시작"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new _messages on start"
 msgstr "시작할 때 새 메시지 확인(_M)"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new messa_ges in all active accounts"
 msgstr "사용 중인 모든 계정에서 새 메시지 확인(_G)"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 msgid "Message Display"
 msgstr "메시지 표시"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 사용(_U)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "S_tandard Font:"
 msgstr "일반 글꼴(_T):"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Fix_ed Width Font:"
 msgstr "고정폭 글꼴(_E):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지난 뒤 메시지를 읽은 것으로 표시(_M)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 표시(_Q):"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "색을 고르십시오"
+
+#: ../mail/mail-config.ui.h:89
 msgid "color"
 msgstr "색상"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:90
 msgid "Default character e_ncoding:"
 msgstr "기본 문자 인코딩(_N):"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:91
 msgid "Apply the same _view settings to all folders"
 msgstr "모든 폴더에 같은 보기 설정 적용(_V)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:92
 msgid "F_all back to threading messages by subject"
 msgstr "연관된 메시지가 아니더라도 제목에 따라 글타래로 만들기(_A)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:93
 msgid "Delete Mail"
 msgstr "메일 삭제"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:94
 msgid "Empty _trash folders"
 msgstr "휴지통 폴더 비우기(_T)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:95
 msgid "Confirm _when expunging a folder"
 msgstr "폴더를 비울 때 확인 질문(_W)"
 
+#: ../mail/mail-config.ui.h:96
+msgid "Archive Mail"
+msgstr "메일 모음"
+
+#: ../mail/mail-config.ui.h:97
+msgid "On This Computer A_rchive folder:"
+msgstr "이 컴퓨터 모음 폴더(_R):"
+
+#: ../mail/mail-config.ui.h:98
+msgid "Archive folder to use for On This Computer messages"
+msgstr "이 컴퓨터 메시지의 모음 폴더"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:100
 msgid "_Show animated images"
 msgstr "애니메이션 표시(_S)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML 메일을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
 
 # 진행 상태가 아니라 설정 창의 제목, "~하는 중"으로 번역하지 말 것
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:102
 msgid "Loading Images"
-msgstr "그림 읽어들이기"
+msgstr "이미지 읽어들이기"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:103
 msgid "_Never load images from the Internet"
-msgstr "그림을 인터넷에서 읽어들이지 않기(_N)"
+msgstr "이미지를 인터넷에서 읽어들이지 않기(_N)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:104
 msgid "_Load images only in messages from contacts"
-msgstr "보낸이가 연락처에 들어 있는 메시지에서만 그림 읽어들이기(_L)"
+msgstr "보낸이가 연락처에 들어 있는 메시지에서만 이미지 읽어들이기(_L)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:105
 msgid "_Always load images from the Internet"
-msgstr "항상 인터넷에서 그림 읽어들이기(_A)"
+msgstr "항상 인터넷에서 이미지 읽어들이기(_A)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:106
 msgid "HTML Messages"
 msgstr "HTML 메시지"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "레이블"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "보내는 사람 사진"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:109
 msgid "_Show the photograph of sender in the message preview"
 msgstr "메일 미리 보기에서 보낸 사람의 사진 보이기(_S)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:110
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "보낸 사람의 gravatar.com 사진 검색(_V)"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Displayed Message Headers"
 msgstr "표시하는 메시지 헤더"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:112
 msgid "Mail Headers Table"
 msgstr "메일 헤더 표"
 
-#: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../mail/mail-config.ui.h:113
+#: ../modules/addressbook/autocompletion-config.c:117
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "날짜/시각 형식"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:115
 msgid "Check incoming _messages for junk"
 msgstr "받은 메일이 정크 메일인지 검사(_M)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:116
 msgid "_Delete junk messages"
 msgstr "정크 메일 삭제(_D)"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_S)"
+#: ../mail/mail-config.ui.h:117
+msgid "Junk Test Options"
+msgstr "정크메일 테스트 옵션"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:118
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_K)"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:119
 msgid "_Lookup in local address book only"
 msgstr "로컬 주소록만 찾아 보기(_L)"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션은 무시합니다."
+#: ../mail/mail-config.ui.h:120
+msgid "Check cu_stom headers for junk"
+msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_S)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:122
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "암호화 없음"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:123
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:124
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
@@ -15121,7 +17350,7 @@ msgid ""
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거하시겠습니까?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "지운 메시지 비우기(_E)"
 
@@ -15399,10 +17628,6 @@ msgstr ""
 "이 폴더를 무시할 수도 있고, 덮어 쓰거나, 그 내용 뒤에 덧붙이거나, 끝낼 수 있"
 "습니다."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "무시"
-
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "덮어 쓰기(_O)"
@@ -15591,6 +17816,10 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "'{0}' 폴더에 중복 메시지가 없습니다."
 
 #: ../mail/mail.error.xml.h:155
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; 계정에 연결하는데 실패했습니다."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; 계정에 연결을 끊는데 실패했습니다."
 
@@ -15607,38 +17836,51 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+msgid "Message is not available in offline mode."
+msgstr "오프라인 모드에서 메시지를 볼 수 없습니다."
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr "메시지를 아직 다운로드하지 않아서 그럴 수도 있습니다. 폴더나 계정이 연결 중지 상태 동기화 표시되었을 수 있습니다. 그러면 계정이 다시 온라인 상태가 되면 파일-&gt;연결 중지 
상태 용도로 메시지 다운로드 메뉴를 사용하십시오. 이 그리고 이 폴더를 선택해서 연결 중지 상태에서 모든 메시지가 있는지 확인하십시오."
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "폴더를 여는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "중복 메시지를 찾는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "메시지를 가져오는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "메시지를 읽은 것으로 표시하는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "메시지에서 첨부 파일을 제거하는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "연결 중지 상태 사용 용도로 메시지 다운로드에 실패했습니다."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "메시지를 디스크에 저장하는데 실패했습니다."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "숨긴 파일을 첨부했습니다."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15646,51 +17888,84 @@ msgstr ""
 "이름이 {0}인 첨부 파일은 숨긴 파일이므로 민감한 데이터가 들어 있을 수도 있습"
 "니다. 보내기 전에 확인하십시오."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "인쇄 실패."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "프린터 응답은 &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "이 작업을 {0}에 수행할 수 없습니다."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "이 작업을 끝마치려면 온라인에서 작업해야 합니다."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "&quot;{0}&quot; 계정에서 메시지:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:177
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "'{0}' 폴더에서 무시할 스레드 표시에 실패했습니다"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "'{0}' 폴더에서 무시할 스레드 표시 해제에 실패했습니다"
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr "'{0}' 폴더에서 무시할 하위 스레드 표시에 실패했습니다"
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr "'{0}' 폴더에서 무시할 하위 스레드 표시 해제에 실패했습니다"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "취소하는 중..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "메일 보내고 받기"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 msgid "Updating..."
 msgstr "업데이트 중..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "'%s'에서 새 메일 확인"
 
+#: ../mail/mail-send-recv.c:1434
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr "'%s'에서 정크메일 삭제 및 휴지통 비우기"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-send-recv.c:1436
+#, c-format
+msgid "Deleting junk at '%s'"
+msgstr "'%s'의 정크메일을 삭제"
+
+# 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-send-recv.c:1438
+#, c-format
+msgid "Expunging trash at '%s'"
+msgstr "'%s' 안의 휴지통을 비우기"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "검색 폴더"
@@ -15703,86 +17978,86 @@ msgstr "검색 폴더 편집"
 msgid "New Search Folder"
 msgstr "새 검색 폴더"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "봤음"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "응답함"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "전달함"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메시지"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "여러 메시지"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "낮음"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "높음"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "가장 높음"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5719
+#: ../mail/message-list.c:459 ../mail/message-list.c:6043
 msgid "Generating message list"
 msgstr "메시지 목록 작성중"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1846 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: ../mail/message-list.c:1855
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
-msgstr "어제 %p %l:%M "
+msgstr "어제 %p %l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%b %d일 %p %l:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%Y년 %b %d일"
 
-#: ../mail/message-list.c:2755
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr "모든 보이는 메시지 선택"
 
-#: ../mail/message-list.c:3383 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3629 ../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:4690
+#: ../mail/message-list.c:4985
 msgid "Follow-up"
 msgstr "추가 작업"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5980
 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 "
@@ -15793,7 +18068,7 @@ msgstr ""
 "메시지 표시 필터를 만들거나, 검색->지우기 메뉴 항목으로 검색을 비우거나 위의 "
 "질의를 바꿔서 새로 검색을 실행해 검색 기준을 바꾸십시오."
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5988
 msgid "There are no messages in this folder."
 msgstr "이 폴더에는 메시지가 없습니다."
 
@@ -15825,56 +18100,65 @@ msgstr "메시지 보낼 곳"
 msgid "Subject - Trimmed"
 msgstr "제목 - 자름"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "모든 헤더"
+
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "제목이나 주소에 포함"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Recipients contain"
 msgstr "받는 사람에 포함"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "Message contains"
 msgstr "메시지에 포함"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Subject contains"
 msgstr "제목에 포함"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 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:1988
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Body contains"
 msgstr "본문에 포함"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
+msgid "Free form expression"
+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:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "테이블 열(_T):"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "주소 형식"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "주소를 해당하는 국가의 표준에 맞게 형식 맞추기(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "자동 완성"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "항상 주소록에서 자동 완성한 메일 주소를 표시(_S)"
 
@@ -15909,7 +18193,7 @@ msgid "_Contact"
 msgstr "연락처(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "새로운 연락처를 만듭니다"
 
@@ -15919,7 +18203,7 @@ msgid "Contact _List"
 msgstr "연락처 목록(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
@@ -15929,7 +18213,7 @@ msgid "Address _Book"
 msgstr "주소록(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "새 주소록을 만듭니다"
 
@@ -15942,286 +18226,286 @@ msgid "Address Book Properties"
 msgstr "주소록 속성"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "vCard 형식으로 저장"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "모든 연락처 복사(_P)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "선택한 주소록의 연락처를 다른 주소록에 복사합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "주소록 삭제(_E)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "선택한 주소록을 삭제합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "모든 연락처 이동(_V)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "선택한 주소록의 연락처를 다른 주소록으로 옮깁니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "새 주소록(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "주소록 속성(_B)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "선택한 주소록의 속성을 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "새로 고침(_F)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "선택한 주소록을 새로 고칩니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "주소록 지도(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "선택한 주소록의 모든 연락처에 지도를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "선택한 주소록 이름을 바꿉니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "읽어들이기를 중지합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "연락처 복사(_C)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "선택한 연락처를 다른 주소록에 복사합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "연락처 삭제(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "연락처에서 찾기(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "표시한 연락처에서 텍스트를 찾습니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "연락처 전달(_F)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "선택한 연락처를 다른 사람에게 보냅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "연락처 이동(_M)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "선택한 연락처를 다른 주소록에 옮깁니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "새 연락처(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "새 연락처 목록(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "연락처 열기(_O)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "현재 연락처를 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "연락처로 메시지 보내기(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "선택한 연락처로 메시지를 보냅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "동작(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "_Preview"
 msgstr "미리 보기(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "주소록 지도"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "연락처 미리 보기(_P)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "연락처 미리 보기 창을 봅니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "지도 표시(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "연락처 미리 보기 창에 지도를 봅니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_Classic View"
 msgstr "전통적으로 보기(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "연락처 목록 아래에 연락처 미리 보기를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Vertical View"
 msgstr "세로로 보기(_V)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "연락처 목록과 나란히 연락처 미리 보기를 표시합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "맞지 않음"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "고급 검색"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "표시된 모든 연락처를 인쇄합니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "인쇄할 연락처를 미리 봅니다"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "선택한 연락처를 인쇄합니다"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "주소록을 VCard 형식으로 저장(_A)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 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:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "vCard로 저장(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "선택한 연락처를 VCard 형식으로 저장합니다"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "연락처 전달(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "연락처 전달(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "메시지를 연락처에 보내기(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "메시지를 목록에 보내기(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "메시지를 연락처에 보내기(_S)"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16232,17 +18516,17 @@ msgstr ""
 "메일, 달력, 작업, 메모, 연락처 모두를 복구할 수 있습니다. 모든 개인 설정, 메"
 "일 필터 기능 등도 복구합니다."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "백업 파일에서 복구(_R):"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "복구할 백업 파일을 선택하십시오"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "백업에서 복구"
@@ -16260,8 +18544,8 @@ msgid "Select name of the Evolution backup file to restore"
 msgstr "복구할 에볼루션 백업 파일 이름 선택"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "복구한 다음에 에볼루션 다시 시작(_R)"
+msgid "Re_start Evolution after restore"
+msgstr "복구한 다음에 에볼루션 다시 시작(_S)"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
@@ -16279,104 +18563,104 @@ msgstr "에볼루션 데이터 복구(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "에볼루션 데이터 및 설정을 압축 파일에서 복구합니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "에볼루션 디렉터리 백업"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "에볼루션 디렉터리 복구"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "에볼루션 백업 검사"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "에볼루션 다시 시작"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "그래픽 사용자 인터페이스 사용"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "에볼루션을 종료하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "에볼루션 계정 및 설정을 백업하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "에볼루션 데이터를 백업하는 중(메일, 연락처, 달력, 작업, 메모)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "백업 완료"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "에볼루션 다시 시작하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "현재 에볼루션 데이터를 백업"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "백업에서 파일을 추출하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "에볼루션 설정을 읽어오는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "임시 백업 파일을 삭제하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "레지스트리 서비스를 다시 읽어들이는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 msgid "Evolution Back Up"
 msgstr "에볼루션 백업"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:868
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s 폴더에 백업하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 msgid "Evolution Restore"
 msgstr "에볼루션 복구"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:873
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s 폴더에서 복구하는 중"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Backing up Evolution Data"
 msgstr "에볼루션 데이터를 백업하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Please wait while Evolution is backing up your data."
 msgstr "에볼루션에서 데이터를 백업하는 동안 잠시 기다리십시오."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Restoring Evolution Data"
 msgstr "에볼루션 데이터를 복구하는 중입니다"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:946
 msgid "Please wait while Evolution is restoring your data."
 msgstr "에볼루션에서 데이터를 복구하는 동안 잠시 기다리십시오."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:968
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "이 작업은 계정의 데이터 크기에 따라 시간이 걸릴 수도 있습니다."
 
@@ -16401,8 +18685,8 @@ msgstr ""
 "가 있으면 계속 하시기 전에 미리 저장하십시오."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "에볼루션을 닫고 백업"
+msgid "Close and _Back up Evolution"
+msgstr "에볼루션을 닫고 백업(_B)"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -16421,8 +18705,8 @@ msgstr ""
 "터와 설정을 삭제하고 백업에서 복구합니다."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "에볼루션을 닫고 복구"
+msgid "Close and _Restore Evolution"
+msgstr "에볼루션을 닫고 복구(_R)"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -16432,93 +18716,98 @@ msgstr "권한이 없습니다"
 msgid "The selected folder is not writable."
 msgstr "선택한 폴더는 읽기 전용입니다."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:161
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "보고필터를 시작하는데 실패했습니다 (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:179
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "메일 메시지 내용을 보고필터에 전달하는데 실패했습니다: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:228
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "보고필터가 이상 종료했거나 메일 메시지를 처리하는데 실패했습니다"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:373
 msgid "Bogofilter Options"
 msgstr "보고필터 옵션"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:382
 msgid "Convert message text to _Unicode"
 msgstr "메시지 텍스트를 유니코드로 변환(_U)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:540
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "보고필터"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "보고필터를 사용한 정크메일 필터링"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "표준 LDAP 포트"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP, SSL 사용(사용하지 않기를 권장)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "마이크로소프트 글로벌 카탈로그"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "마이크로소프트 글로벌 카탈로그, SSL 사용"
 
 # 주의: "-중"으로 번역하지 말 것
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "LDAP에 연결"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "포트:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS(추천)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "암호화:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "인증"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "익명"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "고유 이름(DN) 사용"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "방식:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16528,37 +18817,37 @@ msgstr ""
 "LDAP 서버에 익명 접근이 가능해야 합니다."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "LDAP 사용"
 
 # 진행 상태가 아니라 설정 창의 제목, "~하는 중"으로 번역하지 말 것
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "검색"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "검색 기준:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "가능한 검색 기준 찾기"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "한 단계"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "하위 트리"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "검색 범위:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -16569,29 +18858,29 @@ msgstr ""
 "\"의 검색 범위는 검색 기준 아래의 모든 엔트리에 대해서 찾게 됩니다. 검색 범위"
 "가 \"한 단계\"이면 검색 기준에서 한 단계 아래의 엔트리만 포함합니다."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "검색 필터:"
 
 # 진행 상태가 아니라 설정 창의 제목, "~하는 중"으로 번역하지 말 것
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "다운로드"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "한계치:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "연락처"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "한계치에 도달할 때까지 이 주소록 보기"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
@@ -16600,61 +18889,70 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch 피하기(아파치 2.2.8 미만 버전에서 필요)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
+#: ../modules/cal-config-google/e-google-chooser.c:424
+#: ../modules/cal-config-google/e-google-chooser.c:433
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP 오류: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
+#: ../modules/cal-config-google/e-google-chooser.c:462
 msgid "Could not parse response"
 msgstr "응답을 분석할 수 없음"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-google/e-google-chooser.c:471
 msgid "Empty response"
 msgstr "응답 비우기"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
+#: ../modules/cal-config-google/e-google-chooser.c:479
 msgid "Unexpected reply from server"
 msgstr "서버에서 예상치 못한 응답"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099
+#: ../modules/cal-config-google/e-google-chooser.c:1101
 msgid "Could not locate user's calendars"
 msgstr "사용자 달력을 찾을 수 없음"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
 msgid "Path"
 msgstr "경로"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:348
 msgid "Choose a Calendar"
 msgstr "달력 선택"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:351
 msgid "Choose a Memo List"
 msgstr "메모 목록 선택"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:354
 msgid "Choose a Task List"
 msgstr "작업 목록 선택"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
 msgid "Find Calendars"
 msgstr "달력 찾기"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
 msgid "Find Memo Lists"
 msgstr "메모 목록 찾기"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
 msgid "Find Task Lists"
 msgstr "작업 목록 찾기"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
 msgid "Email:"
 msgstr "전자메일:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
 msgid "Server handles meeting invitations"
 msgstr "서버에서 모임 초대를 처리"
 
@@ -16662,23 +18960,14 @@ msgstr "서버에서 모임 초대를 처리"
 msgid "Choose which address books to use."
 msgstr "어떤 주소록을 사용할지 선택하십시오."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "생일 및 기념일 달력에서 사용"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "기본 사용자 달력"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "'%s' 사용자의 구글 암호를 입력하십시오."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "사용자가 암호 입력을 거부했습니다"
-
 #: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "현재 i캘린더 파일(ics) 사용"
@@ -16699,59 +18988,136 @@ msgstr "파일:"
 msgid "Allow Evolution to update the file"
 msgstr "에볼루션에서 파일 업데이트 허용"
 
-#. Translators: Translate to the default units to use for presenting
-#. * temperature units to the user. The value can be only "default:inch"
-#. * or "default:mm", any other value is treated as "default:mm" (quotes
-#. * for clarity only). Note the value is used only if the system this
-#. * is running on doesn't provide other ways for figuring out temperature
-#. * units for the current locale.
-#.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:188
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "화씨(°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:265
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "섭씨(°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "켈빈(K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:271
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "단위:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "가져오기(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "행사 가져오기"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "메모 가져오기"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "작업 가져오기"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "달력 선택"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "메모 목록 선택"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "작업 목록 선택"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "달력으로 가져오기(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "작업으로 가져오기(_M)"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "메모 목록으로 가져오기(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "작업 목록으로 가져오기(_M)"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "새 달력"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "새 메모 목록"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "새 작업 목록"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "행사를 '%s' 달력으로 복사"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "행사를 '%s' 달력으로 옮기기"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "메모를 '%s' 메모 목록으로 복사"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "메모를 '%s' 메모 목록으로 옮기기"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "작업을 '%s' 작업 목록으로 복사"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "작업을 '%s' 작업 목록으로 옮기기"
+
+# a11y
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "달력 선택"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "메모 목록 선택"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "작업 목록 선택"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
@@ -16825,7 +19191,7 @@ msgid "_24 hour"
 msgstr "_24시간"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "근무 주"
 
@@ -16881,14 +19247,10 @@ msgstr "일(_U)"
 msgid "Day _ends:"
 msgstr "하루의 끝(_E):"
 
-# "Prompt when sending .." 따위 확인 질문 설정 제목
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "확인"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "항목을 지울 때 확인 질문하기(_A)"
+# 주의: 보기에 대한 옵션이라는 뜻. '...보기'가 아님.
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "보기 옵션"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -16914,147 +19276,140 @@ msgstr "좌측 하단의 달력에서 반복 행사를 기울여 표시(_E)"
 msgid "Sc_roll Month View by a week"
 msgstr "한 주 단위로 달별 보기를 스크롤(_R)"
 
+# "Prompt when sending .." 따위 확인 질문 설정 제목
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "확인"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "항목을 지울 때 확인 질문하기(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "표시"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "작업 목록"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "오늘 마감인 작업 강조(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "마감이 지난 작업 강조(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "끝마친 작업이 다음 시간이 지나면 숨기기(_H):"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "알림 영역에서만 미리 알림 표시(_N)"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "미리 알림 표시(_O)"
 
 # FIXME: bad msgid
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr ", 매 약속 전에"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "미리 알림 표시(_R)"
 
 # FIXME: bad msgid
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr ", 매 기념일/생일 전에"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "미리 알림을 지정할 달력을 선택하십시오"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "기본 약속 있음/없음 서버"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "서식:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u 및 %d 기호는 전자메일 주소의 사용자와 도메인으로 바뀝니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "게시 정보"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "새 달력"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "하루 종일 약속(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "달력 및 작업"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "'%s' 달력을 여는 중"
-
-# a11y
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "달력 선택"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "인쇄"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "달력 속성"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 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 "
@@ -17067,377 +19422,373 @@ msgstr ""
 # event -> 행사, Microsoft Office XP 참고
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "항목을 복사하는 중"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "항목을 옮기는 중"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+msgid "Making an occurrence movable"
+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:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "행사"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "iCalendar 형식으로 저장"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "달력 삭제(_E)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "선택한 달력을 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "뒤로 이동"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "앞으로 이동"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "오늘 선택"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "날짜 선택(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "지정한 날짜 선택"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "완전히 지우기(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "지나간 약속과 모임을 완전히 지웁니다"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "선택한 달력을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "선택한 달력 이름을 바꿉니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "다음 찾기(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "현재 검색 문자열의 다음 해당 문구를 찾습니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "이전 찾기(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "현재 검색 문자열의 이전 해당 문구를 찾습니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "검색 실행 중지(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "현재 실행 중인 검색을 중지합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "이 달력만 표시(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "약속 삭제(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "선택한 약속을 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "이 경우 삭제(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "이 경우를 삭제합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "모든 경우 삭제(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "모든 경우를 삭제합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "새 하루 종일 행사(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "새 모임(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "새 모임을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우 옮길 수 있게 만들기(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "현재 약속을 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "답장(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "모임 정하기(_S)..."
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "약속을 모임으로 변환합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "약속으로 변환(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "모임을 약속으로 변환합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "끝내기"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "하루"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "하루씩 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "목록"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "목록으로 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "한 달"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "한 달씩 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "한 주씩"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "한 주씩 봅니다"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "한 주씩 근무일 기준으로 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "활성화한 약속"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7일 간의 약속"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "5번 미만 해당"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1808
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "인쇄..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "이 달력을 인쇄합니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "iCalendar로 저장(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 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:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "메모"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "새 메모(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "새 메모를 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "메모 열기(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "선택한 메모를 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "선택한 메모를 인쇄합니다"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "일치하는 다음 이벤트 찾는 중"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "일치하는 이전 이벤트 찾는 중"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, 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:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, 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:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "활성화한 달력이 없으면 검색할 수 없습니다"
 
@@ -17445,237 +19796,209 @@ msgstr "활성화한 달력이 없으면 검색할 수 없습니다"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. 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:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "작업"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "선택한 작업을 마친 것으로 표시합니다"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "선택한 작업을 미완료로 표시합니다"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "작업 열기(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "선택한 작업을 봅니다"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "선택한 작업을 인쇄합니다"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "새 메모 목록"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "메모(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "공유 메모(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "새 공유 메모를 만듭니다"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "메모 목록(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "새 메모 목록을 만듭니다"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "'%s' 메모 목록을 여는 중"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "메모 목록 선택"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "메모 인쇄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "메모 목록 속성"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "메모 삭제(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "메모에서 찾기(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "표시한 메모에서 텍스트를 찾습니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "메모 목록 삭제(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "선택한 메모 목록을 삭제합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "새 메모 목록(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "선택한 메모 목록을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "선택한 메모 목록의 이름을 바꿉니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "이 메모 목록만 표시(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "메모 미리 보기(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "메모 미리 보기 창 보기"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "메모 목록 아래에 메모 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "메모 목록과 나란히 메모 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "메모 목록 인쇄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "인쇄할 메모 목록을 미리 봅니다"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "메모 삭제"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "메모 삭제"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d개 선택"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "새 작업 목록"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "새로 할당한 작업을 만듭니다"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "작업 목록(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "'%s' 작업 목록을 여는 중"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "작업 목록 선택"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "작업 목록 속성"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17688,113 +20011,109 @@ msgstr ""
 "정말로 이 작업을 지우시겠습니까?"
 
 # 주의: check button에 사용. 문장으로 번역하지 말 것
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "다시 묻지 않기"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "작업 삭제(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "작업에서 찾기(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "표시한 작업에서 텍스트를 찾습니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "작업 목록 삭제(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "선택한 작업 목록을 삭제합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "새 작업 목록(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "선택한 작업 목록을 새로 고칩니다"
 
 # tooltip
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "선택한 작업 목록 이름을 바꿉니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "이 작업 목록만 표시(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "작업 미완료 표시(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "끝마친 작업을 삭제합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "작업 미리 보기(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "작업 미리 보기 창 보기"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "작업 목록 아래에 작업 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "작업 목록과 나란히 작업 미리 보기를 표시합니다"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7일 간의 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "마감이 지난 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "작업 목록 인쇄"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "인쇄할 작업 목록을 미리 봅니다"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "작업 삭제"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "작업 삭제"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "지운 메시지 비우는 중"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -18168,259 +20487,260 @@ msgstr "%s님이 %s을(를) 통해 다음 공유 메모를 취소했습니다:"
 msgid "%s has canceled the following shared memo:"
 msgstr "%s님이 다음 공유 메모를 취소했습니다:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:676
 msgid "All day:"
 msgstr "하루 종일:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "시작 날짜:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
 msgid "Start time:"
 msgstr "시작 시각:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:691
 msgid "End day:"
 msgstr "끝 날짜:"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "End time:"
 msgstr "마침 시각:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Ope_n Calendar"
 msgstr "달력 열기(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Decline all"
 msgstr "모두 거부(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1047
 msgid "_Decline"
 msgstr "거부(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1050
 msgid "_Tentative all"
 msgstr "모두 잠정적(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1053
 msgid "_Tentative"
 msgstr "잠정적(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1056
 msgid "Acce_pt all"
 msgstr "모두 수락(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1059
 msgid "Acce_pt"
 msgstr "수락(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1062
 msgid "Send _Information"
 msgstr "정보 보내기(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1065
 msgid "_Update Attendee Status"
 msgstr "참석자 상태 업데이트(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1068
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "업데이트(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
 msgid "Comment:"
 msgstr "설명:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Send reply to sender"
 msgstr "보낸 이에게 답장"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1571
 msgid "Send _updates to attendees"
 msgstr "참석자에게 업데이트 보내기(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Apply to all instances"
 msgstr "모든 경우에 적용(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Show time as _free"
 msgstr "시간을 약속 없음으로 표시(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1576
 msgid "_Preserve my reminder"
 msgstr "내 미리 알림 유지(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1577
 msgid "_Inherit reminder"
 msgstr "미리 알림 상속(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "작업(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1914
 msgid "_Memos:"
 msgstr "메모(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3220
 msgid "Sa_ve"
 msgstr "저장(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:5131
 msgid "Attendee status updated"
 msgstr "참석자 상태를 업데이트했습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3862
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' 달력에 들어 있는 약속이 이 모임과 충돌합니다"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3891
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' 달력에 약속을 발견했습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:4004
 msgid "Unable to find any calendars"
 msgstr "달력을 하나도 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4012
 msgid "Unable to find this meeting in any calendar"
 msgstr "어느 달력에서도 이 모임을 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../modules/itip-formatter/itip-view.c:4017
 msgid "Unable to find this task in any task list"
 msgstr "어느 작업 목록에서도 이 작업을 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../modules/itip-formatter/itip-view.c:4022
 msgid "Unable to find this memo in any memo list"
 msgstr "어느 메모 목록에서도 이 메모를 찾을 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait..."
 msgstr "달력을 여는 중입니다. 잠시 기다리십시오..."
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4372
 msgid "Searching for an existing version of this appointment"
 msgstr "이 약속의 현재 버전을 찾는 중입니다"
 
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4767
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목을 '%s' 달력에 보낼 수 없습니다.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4683
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력에 수락이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력에 미정이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4793
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력에 거절이라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4799
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력에 취소라고 보냄"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:5384
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "바뀐 사항을 달력에 저장하는 중입니다. 잠시 기다리십시오..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4861
 msgid "Unable to parse item"
 msgstr "항목을 파싱할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5054
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:5071
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:5075
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보낼 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../modules/itip-formatter/itip-view.c:5123
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참석자를 업데이트할 수 없습니다. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5167
 msgid "The meeting is invalid and cannot be updated"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5243
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못된 상태 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5354
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5417
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5422
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5427
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5438
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임이 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5343
+#: ../modules/itip-formatter/itip-view.c:5443
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업이 없습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5348
+#: ../modules/itip-formatter/itip-view.c:5448
 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:5413
+#: ../modules/itip-formatter/itip-view.c:5513
 msgid "calendar.ics"
 msgstr "달력.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5518
 msgid "Save Calendar"
 msgstr "달력 저장"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력이 잘못되었습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5581
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18428,16 +20748,16 @@ msgstr ""
 "메시지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 iCalendar가 아닙니"
 "다."
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
 msgid "The item in the calendar is not valid"
 msgstr "달력 안이 항목이 올바르지 않습니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5624
+#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5755
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18445,34 +20765,34 @@ msgstr ""
 "메시지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
 "들어 있지 않습니다."
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5669
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력에 여러 개의 항목이 들어 있습니다"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "이 항목을 모두 처리하려면, 파일을 저장해서 그 달력을 가져와야 합니다."
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6172
 msgctxt "cal-itip"
 msgid "None"
 msgstr "없음"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6188
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6348
 msgid "This meeting recurs"
 msgstr "이 약속 반복"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6351
 msgid "This task recurs"
 msgstr "이 작업 반복"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6354
 msgid "This memo recurs"
 msgstr "이 메모 반복"
 
@@ -18516,19 +20836,19 @@ msgstr "ITIP 포매터"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "메일 메시지의 \"text/calendar\" MIME 부분을 표시합니다."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "구글 기능"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "구글 달력을 에볼루션에 추가(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "구글 주소록을 에볼루션에 추가(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "IMAP 연결을 사용해야 할 수도 있습니다"
 
@@ -18570,60 +20890,60 @@ msgid "Choose a mbox spool directory"
 msgstr "MBOX 스풀 디렉터리를 선택하십시오"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "설정"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "서버(_S):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "포트(_P):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "암호화 방식(_M):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "연결 뒤에 STARTTLS"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 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"
@@ -18633,23 +20953,23 @@ msgstr ""
 "   %F - 보낸 사람 주소\n"
 "   %R - 받는 사람 주소"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../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:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "서버에 인증이 필요(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "종류(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "야후! 기능"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "야후! 달력과 작업을 이 계정에 추가(_L)"
 
@@ -18659,478 +20979,487 @@ msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메시지 %d개"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "메일 메시지(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:352
 msgid "Compose a new mail message"
 msgstr "메일 메시지를 새로 작성합니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "메일 계정(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:362
 msgid "Create a new mail account"
 msgstr "새 메일 계정을 만듭니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:369
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:684
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:693
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:702
 msgid "Composer Preferences"
 msgstr "메일 작성 기본 설정"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:712
 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:964
+#: ../modules/mail/e-mail-shell-backend.c:1004
 msgctxt "label"
 msgid "None"
 msgstr "없음"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:706
 msgid "Marking messages as read..."
 msgstr "메시지를 읽은 것으로 표시..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "계정 사용 않기(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "이 계정을 사용하지 않습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Edit properties of this account"
 msgstr "이 계정의 속성을 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Refresh list of folders of this account"
 msgstr "이 계정의 폴더 목록을 새로 고칩니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "_Download Messages for Offline Usage"
 msgstr "연결 중지 상태 용도로 메시지 다운로드(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "연결 중지 상태 사용으로 표시한 계정 및 폴더의 메시지를 다운로드합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Fl_ush Outbox"
 msgstr "보낼 편지함 플러시(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Copy Folder To..."
 msgstr "폴더 복사(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Copy the selected folder into another folder"
 msgstr "선택한 폴더를 다른 폴더로 복사합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Permanently remove this folder"
 msgstr "이 폴더를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "E_xpunge"
 msgstr "완전히 삭제(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "이 폴더의 삭제한 모든 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Mar_k All Messages as Read"
 msgstr "모든 메시지를 읽은 것으로 표시(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Mark all messages in the folder as read"
 msgstr "폴더의 모든 메시지를 읽은 것으로 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "_Move Folder To..."
 msgstr "폴더 옮기기(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Move the selected folder into another folder"
 msgstr "선택한 폴더를 다른 폴더로 옮깁니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "_New..."
 msgstr "새로 만들기(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Create a new folder for storing mail"
 msgstr "메일을 저장하는 새 폴더를 만듭니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Change the properties of this folder"
 msgstr "이 폴더의 속성을 바꿉니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Refresh the folder"
 msgstr "폴더를 새로 고침"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the name of this folder"
 msgstr "이 폴더의 이름을 바꿉니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "Select Message _Thread"
 msgstr "메시지 글타래 선택(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Select all messages in the same thread as the selected message"
 msgstr "선택한 메시지와 같은 글타래의 모든 메시지를 선택합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Select Message S_ubthread"
 msgstr "메시지 아래 글타래 선택(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Select all replies to the currently selected message"
 msgstr "현재 선택한 메시지의 답장을 모두 선택합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Empty _Trash"
 msgstr "지운 메시지 비우기(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "모든 폴더의 삭제한 메시지를 완전히 제거합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_New Label"
 msgstr "새 레이블(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "N_one"
 msgstr "없음(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Manage Subscriptions"
 msgstr "구독 관리(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "원격 서버의 폴더를 구독/구독해지 합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Send / _Receive"
 msgstr "보내고 받기(_R)"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Send queued items and retrieve new items"
 msgstr "밀린 메일을 보내고 새 메일을 받습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "R_eceive All"
 msgstr "모두 받기(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Receive new items from all accounts"
 msgstr "모든 계정의 항목을 받습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Send All"
 msgstr "모두 보내기(_S)"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Send queued items in all accounts"
 msgstr "모든 계정의 밀린 항목을 보냅니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "Cancel the current mail operation"
 msgstr "현재 메일 동작을 취소합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Collapse All _Threads"
 msgstr "모든 글타래 접기(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "Collapse all message threads"
 msgstr "모든 메시지 글타래를 접습니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "E_xpand All Threads"
 msgstr "모든 글타래 펼치기(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "Expand all message threads"
 msgstr "모든 메시지 글타래의 지운 메시지를 비웁니다."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "_Message Filters"
 msgstr "메시지 필터(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Create or edit rules for filtering new mail"
 msgstr "새 메일 필터 규칙을 만들거나 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "_Subscriptions..."
 msgstr "구독(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "F_older"
 msgstr "폴더(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Label"
 msgstr "레이블(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 msgid "C_reate Search Folder From Search..."
 msgstr "검색한 결과로 검색 폴더 만들기(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Search F_olders"
 msgstr "검색 폴더(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Create or edit search folder definitions"
 msgstr "검색 폴더 정의를 만들거나 편집합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1916
 msgid "Show Message _Preview"
 msgstr "메시지 미리보기 보이기(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show message preview pane"
 msgstr "메시지 보기 창을 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show _Deleted Messages"
 msgstr "삭제한 메시지 보이기(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show deleted messages with a line through them"
 msgstr "삭제한 메시지를 선을 그어 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "_Group By Threads"
 msgstr "글타래로 묶음(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Threaded message list"
 msgstr "연관된 메시지 목록"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1940
 msgid "_Unmatched Folder Enabled"
 msgstr "해당 없음 폴더 사용(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "해당 없음 검색 폴더를 사용할지 여부를 토글합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:1962
 msgid "Show message preview below the message list"
 msgstr "메시지 목록 아래에 메시지 미리 보기를 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show message preview alongside the message list"
 msgstr "메시지 목록과 나란히 메시지 미리 보기를 표시합니다"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1977
 msgid "All Messages"
 msgstr "모든 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "Important Messages"
 msgstr "중요한 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Last 5 Days' Messages"
 msgstr "최근 5일간 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Messages Not Junk"
 msgstr "정크메일 아닌 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "Messages with Attachments"
 msgstr "첨부가 있는 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "No Label"
 msgstr "레이블 없음"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2019
 msgid "Read Messages"
 msgstr "읽은 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Unread Messages"
 msgstr "읽지 않은 메시지"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Subject or Addresses contain"
 msgstr "제목이나 주소에 포함"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
 msgid "All Accounts"
 msgstr "모든 계정"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Current Account"
 msgstr "현재 계정"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Current Folder"
 msgstr "현재 폴더"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "모든 계정 검색"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "계정 검색"
 
-#: ../modules/mail/e-mail-shell-view-private.c:969
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d개 선택, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
 #: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d개 삭제"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
-#: ../modules/mail/e-mail-shell-view-private.c:1010
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d개 정크"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d개 임시"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d개 안 보냄"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d개 보냄"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d개 안 읽음, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-msgid "Trash"
-msgstr "지운 메시지"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1502
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "보내기 / 받기"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:394
 msgid "Select Folder to Add"
 msgstr "추가할 폴더 선택"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:854
 msgid "Folder"
 msgstr "폴더"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:890
 msgid "Recipient"
 msgstr "받는 사람"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1163
+msgid "Keep in Outbox"
+msgstr "보낼 편지함에 보관"
+
+#: ../modules/mail/em-composer-prefs.c:1164
+msgid "Send immediately"
+msgstr "즉시 보내시겠습니까?"
+
+#: ../modules/mail/em-composer-prefs.c:1165
+msgid "Send after 5 minutes"
+msgstr "5분 뒤에 보내기"
+
+#: ../modules/mail/em-composer-prefs.c:1238
 msgid "Language(s)"
 msgstr "언어"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
-msgstr "나갈 때, 항상"
+msgstr "나갈 때, 매번"
+
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Once per day"
+msgstr "하루에 한 번"
 
 #: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "나갈 때, 하루에 한번"
+msgid "Once per week"
+msgstr "한주에 한번"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "나갈 때, 한주에 한번"
+msgid "Once per month"
+msgstr "한달에 한번"
 
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "나갈 때, 한달에 한번"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "즉시, 폴더 나갈 때"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "헤더"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../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:1214
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "날짜 헤더(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "원본 헤더 값 표시(_O)"
 
@@ -19140,24 +21469,24 @@ msgstr "에볼루션을 기본 전자메일 프로그램으로 하시겠습니
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "%s에게 보낸 \"%s\"에 관한(보낸 때 %s) 메시지를 읽었습니다."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "다음 메일에 대한 배달 확인: \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "다음에 메시지 수신 확인 보내기: '%s'"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "배달 확인 보내기(_N)"
 
@@ -19235,22 +21564,22 @@ msgstr "HTML 버전 표시"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "multipart/alternative 메시지의 HTML 버전을 표시합니다"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "HTML이 있으면 표시"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "에볼루션에서 알아서 보기 좋은 부분을 표시."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "일반 텍스트가 있으면 표시"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -19259,12 +21588,12 @@ msgstr ""
 "일반 텍스트가 있으면 표시하고, 일반 텍스트가 없으면 에볼루션에서 보여줄 부분"
 "을 골라 줍니다."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "일반 텍스트만 표시"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -19293,57 +21622,62 @@ msgstr "일반 텍스트 모드"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "메일 메시지에 HTML이 있더라도 일반 텍스트로 봅니다."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "스팸어새신을 시작하는데 실패했습니다 (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "메일 메시지 내용을 스팸어새신에 전달하는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "스팸어새신에 '%s' 데이터를 쓰는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr "스팸어새신에서 출력을 읽는데 실패했습니다: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "스팸어새신이 이상 종료했거나 메일 메시지를 처리하는데 실패했습니다"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "스팸어새신 옵션"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "원격 테스트 포함(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "이렇게 하면 스팸어새신이 더 안정적으로 작동하지만, 더 느립니다."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "스팸어새신"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+msgstr "프매어새신 사용 정크메일 필터링"
+
 # 설정 tab, 상태 표시가 아님
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "파일 가져오기"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "가져오기 취소함."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "가져오기 마침."
 
@@ -19371,11 +21705,11 @@ msgstr "지정한 형식으로 표시(_F)..."
 msgid "_Other languages"
 msgstr "다른 언어(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "텍스트 강조"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "메일 부분의 텍스트 강조"
 
@@ -19403,10 +21737,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "_CSS"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "자바(_J)"
@@ -19568,30 +21898,26 @@ msgid "_Prolog"
 msgstr "프롤로그(_P)"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "포스트스크립트(_P)"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM 스펙"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "스칼라(_S)"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "스몰토크(_S)"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
@@ -19631,7 +21957,7 @@ msgstr "이 부분을 주소록 연락처로 표시"
 msgid "Evolution Web Inspector"
 msgstr "에볼루션 웹 검사"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "이 메시지를 다시 보지 않기(_D)."
 
@@ -19668,35 +21994,35 @@ msgstr "첨부 알림"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "메일 메시지에 첨부 추가를 잊었을 때 알립니다."
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "자동 연락처"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "메일을 보낼 때 주소록에 항목 만들기(_A)"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "자동 연락처를 사용할 주소록을 선택하십시오"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "인스턴스 메시지 연락처"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "피진 친구 목록의 연락처 정보 및 그림을 동기화(_S)"
+msgstr "피진 친구 목록의 연락처 정보 및 이미지를 동기화(_S)"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "피진 친구 목록에 사용할 주소록을 선택하십시오"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "지금 친구 목록과 동기화(_B)"
 
@@ -19780,12 +22106,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "없음"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "사용자 설정 헤더(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19793,11 +22119,11 @@ msgstr ""
 "사용자 설정 헤더 값을 지정하는 형식은:\n"
 "사용자 설정 헤더의 키와 값을 \";\"으로 구분합니다."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "키"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "값"
@@ -19831,8 +22157,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "새 메일을 편집할 때 자동으로 실행(_A)"
 
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr "외부 편집기에서 작성"
 
@@ -19884,7 +22210,7 @@ msgstr "얼굴 사진을 고르십시오"
 
 #: ../plugins/face/face.c:298
 msgid "Image files"
-msgstr "그림 파일"
+msgstr "이미지 파일"
 
 #: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
@@ -19912,27 +22238,19 @@ msgstr "해당 파일을 읽을 수 없습니다"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
-msgstr "그림 크기가 잘못되었습니다"
+msgstr "이미지 크기가 잘못되었습니다"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
-msgstr "48 x 48 크기의 그림 파일을 선택하십시오"
+msgstr "48 x 48 크기의 이미지 파일을 선택하십시오"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
 msgid "Not an image"
-msgstr "그림이 아닙니다"
+msgstr "이미지가 아닙니다"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "선택한 파일은 올바른 PNG 그림 파일이 아닙니다. 오류: {0}"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "내장 그림"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "그림을 메일 메시지에서 직접 표시합니다."
+msgstr "선택한 파일은 올바른 PNG 이미지 파일이 아닙니다. 오류: {0}"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
@@ -20145,7 +22463,25 @@ msgstr "새 메시지가 도착하면 알립니다."
 msgid "Created from a mail by %s"
 msgstr "%s 메일에서 만들어짐"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "새로 만들기(_N)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -20153,7 +22489,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 행사가 들어 있습니다. 예전 행사를 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../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 "
@@ -20161,7 +22497,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 작업이 들어 있습니다. 예전 작업을 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../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 "
@@ -20169,7 +22505,7 @@ msgid ""
 msgstr ""
 "선택한 달력에 이미 '%s' 메모가 들어 있습니다. 예전 메모를 편집하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../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 "
@@ -20180,7 +22516,7 @@ msgid_plural ""
 msgstr[0] ""
 "행사로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../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 "
@@ -20191,7 +22527,7 @@ msgid_plural ""
 msgstr[0] ""
 "작업으로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../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 "
@@ -20202,29 +22538,29 @@ msgid_plural ""
 msgstr[0] ""
 "쪽지로 변환할 메일을 %d개 선택했습니다. 정말로 모두 추가하시겠습니까?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../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:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[요약 없음]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../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:818
+#: ../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:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "달력을 열 수 없습니다. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -20232,7 +22568,7 @@ msgstr ""
 "선택한 달력이 읽기 전용이라서 여기에 행사를 만들 수 없습니다. 다른 달력을 선"
 "택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -20240,7 +22576,7 @@ msgstr ""
 "선택한 작업 목록이 읽기 전용이라서 여기에 작업을 만들 수 없습니다. 다른 작업 "
 "목록을 선택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -20248,35 +22584,35 @@ msgstr ""
 "선택한 메모 목록이 읽기 전용이라서 여기에 메모를 만들 수 없습니다. 다른 메모 "
 "목록을 선택하십시오."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr "약속 만들기(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "선택한 메시지에서 새 행사를 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr "메모 만들기(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "선택한 메시지에서 새 메모를 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "작업 만들기(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "선택한 메시지에서 새 작업을 만듭니다"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "모임 만들기(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "선택한 메시지에서 새 모임을 만듭니다"
 
@@ -20372,11 +22708,11 @@ 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:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "글타래를 게시할 수 없습니다."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "달력 정보 게시(_P)"
 
@@ -20458,6 +22794,7 @@ msgid "_Username:"
 msgstr "사용자이름(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "암호(_P):"
 
@@ -20470,8 +22807,8 @@ msgstr "암호 저장(_R)"
 msgid "Publishing Location"
 msgstr "게시 위치"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "잘못된 소스 UID '%s'"
@@ -20589,15 +22926,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "형식(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "대상 파일 선택"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "다른 이름으로 저장(_S)"
 
@@ -20623,38 +22960,42 @@ msgstr ""
 "$ORIG[body] 따위의 변수를 이용합니다. 이 변수는 답장하는 메일 값에 들어 있는 "
 "값으로 바뀝니다."
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "제목 없음"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "서식으로 저장(_T)"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "서식으로 저장"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:335
 msgid "Preparing to go offline..."
 msgstr "연결 중지 상태로 이동하는 준비 중..."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:388
 msgid "Preparing to go online..."
 msgstr "연결 상태로 이동하는 준비 중..."
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:495
 msgid "Preparing to quit"
 msgstr "끝낼 준비 중"
 
 # 주의: 다른 메시지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit..."
 msgstr "끝낼 준비 중..."
 
+#: ../shell/e-shell.c:909
+msgid "Credentials are required to connect to the destination host."
+msgstr "대상 호스트에 연결하려면 신원 정보가 필요합니다."
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "검색"
@@ -20667,20 +23008,20 @@ 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:938
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "보기(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:963
+#: ../shell/e-shell-searchbar.c:955
 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:1031
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr " 위치(_N)"
 
@@ -20692,312 +23033,320 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "모든 파일 (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "사용자 인터페이스 상태 저장"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr googlegroups com>"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "에볼루션 웹사이트"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "분류 편집"
 
-#: ../shell/e-shell-window-actions.c:671
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "버그버디를 설치하지 않았습니다."
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "버그버디를 실행할 수 없습니다."
 
-#: ../shell/e-shell-window-actions.c:850
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../shell/e-shell-window-actions.c:852
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "에볼루션에 대한 정보를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:857 ../shell/e-shell-window-actions.c:871
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "창 닫기(_C)"
 
-#: ../shell/e-shell-window-actions.c:878
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "차례(_C)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:880
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "에볼루션 사용자 안내서를 엽니다"
 
-#: ../shell/e-shell-window-actions.c:906
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "가져오기(_M)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:908
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "다른 프로그램에서 데이터를 가져옵니다"
 
-#: ../shell/e-shell-window-actions.c:913
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "새 창(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:915
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "이 뷰를 새 창을 만듭니다"
 
-#: ../shell/e-shell-window-actions.c:927
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "사용 가능한 분류(_G)"
 
-#: ../shell/e-shell-window-actions.c:929
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "사용 가능한 분류를 관리합니다"
 
-#: ../shell/e-shell-window-actions.c:941
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "짧은 참조 문서(_Q)"
 
-#: ../shell/e-shell-window-actions.c:943
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "에볼루션 바로 가기 키를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:948
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "끝내기(_Q)"
 
-#: ../shell/e-shell-window-actions.c:950
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "프로그램을 끝냅니다"
 
-#: ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "고급 검색(_A)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:957
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "더 복잡한 고급 검색을 수행합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:964
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "현재 검색 파라미터를 지웁니다"
 
-#: ../shell/e-shell-window-actions.c:969
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "저장한 검색 편집(_E)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:971
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "저장한 검색을 관리합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:978
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "검색 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../shell/e-shell-window-actions.c:983
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:985
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "현재 검색 파라미터를 실행합니다"
 
-#: ../shell/e-shell-window-actions.c:990
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "검색 저장(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:992
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "현재 검색 파라미터를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:1004
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "버그 제보(_B)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1006
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "버그버디로 버그제보를 합니다"
 
-#: ../shell/e-shell-window-actions.c:1011
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "연결 중지 상태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1013
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "에볼루션을 연결 중지 상태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1018
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "연결 상태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1020
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "에볼루션을 연결 상태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1048
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "배치(_O)"
 
-#: ../shell/e-shell-window-actions.c:1062
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "새로 만들기(_N)"
+
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "검색(_S)"
 
-#: ../shell/e-shell-window-actions.c:1069
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "전환 단추 모양(_S)"
 
-#: ../shell/e-shell-window-actions.c:1083
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "창(_W)"
 
-#: ../shell/e-shell-window-actions.c:1112
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "보조 모음 보이기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "보조 모음을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1120
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "단추 보이기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1122
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "전환 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "상태 표시줄 보기(_S)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1130
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "상태 표시줄을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1136
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "도구 모음 보이기(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1138
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "도구 모음을 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1160
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "아이콘만(_I)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1162
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "아이콘만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "텍스트만(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1169
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "텍스트만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1174
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "아이콘 및 텍스트(_A)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1176
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "아이콘과 텍스트를 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "도구 모음 모양(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "데스크톱 도구 모음 설정을 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1191
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "현재 뷰 삭제"
 
-#: ../shell/e-shell-window-actions.c:1198
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "사용자 보기 저장..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1200
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "현재 사용자 정의 뷰를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "현재 보기(_U)"
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "사용자 보기"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "현재 뷰는 사용자 정의 뷰입니다"
 
-#: ../shell/e-shell-window-actions.c:1227
+#: ../shell/e-shell-window-actions.c:1272
 msgid "Page Set_up..."
 msgstr "페이지 준비(_U)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1229
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "현재 프린터의 페이지 설정을 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "뷰 선택: %s"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr "뷰 삭제: %s"
 
-#: ../shell/e-shell-window-actions.c:1824
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "이 검색 파라미터를 실행합니다"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "새로 만들기"
 
@@ -21008,7 +23357,7 @@ 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"
@@ -21044,7 +23393,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
 "주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21052,13 +23401,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:301
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21066,39 +23415,39 @@ msgstr ""
 "에볼루션을 시작할 때 지정한 컴포넌트를 표시, 사용 가능한 항목은 'mail', "
 "'calendar', 'contacts', 'tasks', 'memos'"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "해당 크기와 위치를 메인 창에 적용합니다"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "연결 상태에서 시작합니다"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "네트워크 사용 가능 여부를 무시합니다"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "강제로 에볼루션을 끝냅니다"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "플러그인을 아무것도 읽어들이지 않습니다."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전자메일, 연락처, 작업의 미리 보기 창을 사용하지 않습니다."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "뒤의 인자에 쓴 URI와 파일 이름을 가져옵니다."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "실행 중인 에볼루션 프로세스에 끝내는 요청을 합니다"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21107,11 +23456,11 @@ msgstr ""
 "에볼루션을 시작할 수 없습니다. 다른 에볼루션 인스턴스가 응답이 없어 보입니"
 "다. 시스템 오류: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr "- 에볼루션 개인정보 관리 및 메일 클라이언트"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21120,7 +23469,7 @@ msgstr ""
 "%s: --online과 --offline 옵션은 같이 쓸 수 없습니다\n"
 "  자세한 정보를 보려면 '%s --help' 명령을 실행하십시오.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21166,7 +23515,58 @@ msgstr ""
 "버전 2로 먼저 업그레이드한 다음에, 다시 버전 3으로 업그레이드할 수도 있습니"
 "다."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "밀린 백업 동작이 있는 에볼루션을 닫으시겠습니까?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr "에볼루션이 끝나는데 오래 걸립니다. 네트워크 연결 문제로 보입니다. 연기된 동작을 모두 취소하고 즉시 닫으시겠습니까, 아니면 계속 기다리시겠습니까?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "즉시 닫기(_C)"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "계속 기다리기(_W)"
+
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
+msgstr "'{0}'에서 값을 가져오는데 실패했습니다"
+
+#: ../shell/shell.error.xml.h:16
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "'{0}'에 대한 인증을 실행하는데 실패했습니다"
+
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect to '{0}'"
+msgstr "'{0}'에 연결하는데 실패했습니다"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "다시 연결(_R)"
+
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "'{0}'에 대한 자격 수준 확인을 마치는데 실패했습니다"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "'{0}'에 대한 신뢰 수준 확인을 마치는데 실패했습니다"
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "'{0}'에 대한 SSL 인증서가 신뢰할 수 없습니다."
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr "이유: {1}"
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21177,101 +23577,276 @@ msgstr ""
 "\n"
 "신뢰 수준을 편집하십시오:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "인증서 이름"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "발급 대상 기관"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "발급 대상 기관 구분"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "일련 번호"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "목적"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "발급자:"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "발급 주체 기관"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "발급 주체 기관 구분"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "발급 날짜"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "만료 날짜"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 핑거프린트"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 핑거프린트"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "전자메일 주소"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "가져올 인증서를 선택하십시오..."
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr "키와 인증서를 백업할 파일을 선택하십시오..."
 
-#: ../smime/gui/certificate-manager.c:635
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-백업.p12"
+
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "모든 파일"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+msgid "Backup Certificate"
+msgstr "인증서 백업"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+msgid "_File name:"
+msgstr "파일 이름(_F):"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+msgid "Please select a file..."
+msgstr "파일을 고르십시오..."
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr "백업에 인증서 체인 포함(_I)"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+"여기서 설정한 인증서 백업 암호로 새로 만들 백업 파일을 보호합니다.\n"
+"백업을 게속하려면 암호를 설정해야 합니다."
+
+#: ../smime/gui/certificate-manager.c:786
+msgid "_Repeat Password:"
+msgstr "암호 반복(_R):"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr "암호가 일치하지 않습니다"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"중요:\n"
+"인증서 백업 암호를 잊어버리면, 나중에 이 백업을 복구하지 못하게 됩니다.\n"
+"안전한 위치에 기록해 두십시오."
+
+#: ../smime/gui/certificate-manager.c:858
+msgid "No file name provided"
+msgstr "파일 이름을 입력하지 않았습니다"
+
+#: ../smime/gui/certificate-manager.c:862
+msgid "Failed to backup key and certificate"
+msgstr "키와 인증서를 백업하는데 실패했습니다"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "가져올 인증서를 선택하십시오..."
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "인증서를 가져오는데 실패했습니다"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "사용할 때 물어보기"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "안 함"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr "어느 정도"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "완전히"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr "절대적으로"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr "임시로"
+
+#: ../smime/gui/certificate-manager.c:1333
+msgid "Change certificate trust"
+msgstr "인증 신뢰 수준 바꾸기"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "'%s' 호스트에 대한 신뢰 수준 바꾸기:"
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "사용할 때 물어보기(_A)"
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr "임시로, 이 세션만(_T)"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "안 함(_N)"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr "어느 정도(_M)"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "완전히(_F)"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr "절대적으로(_U)"
+
+#: ../smime/gui/certificate-manager.c:1378
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr "이 사이트를 신뢰하기 전에, 그 인증서와 정책과 프로시저를 (있는 경우) 확인해야 합니다."
+
+#: ../smime/gui/certificate-manager.c:1393
+msgid "_Display certificate"
+msgstr "인증서 표시(_D)"
+
+#: ../smime/gui/certificate-manager.c:1598
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "이 메일 서버를 확인할 수 있는 인증서가 파일에 있습니다:"
+
+#: ../smime/gui/certificate-manager.c:1629
+msgid "Host name"
+msgstr "호스트 이름"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "발급자"
+
+#: ../smime/gui/certificate-manager.c:1632
+msgid "Fingerprint"
+msgstr "핑거프린트"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr "신뢰 수준"
+
+#: ../smime/gui/certificate-manager.c:1654
+msgid "_Edit Trust"
+msgstr "신뢰 수준 편집(_E)"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "모든 PKCS12 파일"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "모든 전자메일 인증 파일"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "모든 CA 인증서 파일"
 
@@ -21312,26 +23887,7 @@ msgstr "인증서 데이터베이스의 새 암호를 입력하십시오"
 msgid "Enter new password"
 msgstr "새 암호를 입력하십시오"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"발급 대상:\n"
-"  소유자: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"발급자:\n"
-"  소유자: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "인증서 선택"
 
@@ -21358,7 +23914,7 @@ msgstr "내 인증서"
 
 #: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
-msgstr "다음 사람을 확인할 수 있는 인증서가 있습니다:"
+msgstr "다음 사람을 확인할 수 있는 인증서가 파일에 있습니다:"
 
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
@@ -21375,7 +23931,7 @@ msgstr "기관"
 
 #: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
-msgstr "인증 기관 신뢰수준"
+msgstr "인증 기관 신뢰 수준"
 
 # NOTE: 원문 잘못됨. 점 생략
 #: ../smime/gui/smime-ui.ui.h:18
@@ -21405,24 +23961,20 @@ msgid "Certificate"
 msgstr "인증서"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "인증서 상세 정보"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
-msgstr "전자메일 인증서 신뢰수준 설정"
+msgstr "전자메일 인증서 신뢰 수준 설정"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "이 인증서가 믿을만 하다고 신뢰합니다"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "이 인증서가 믿을만 한 지 신뢰하지 않음"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
-msgstr "인증 기관 신뢰수준 편집(_E)"
+msgstr "인증 기관 신뢰 수준 편집(_E)"
 
 #: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
@@ -21437,19 +23989,50 @@ msgstr "서명"
 msgid "Encrypt"
 msgstr "암호화"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12 파일 암호"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 파일의 암호를 입력하십시오:"
 
-#: ../smime/lib/e-pkcs12.c:307
+# 주의: 접근키 아님
+# SEC_PKCS12CreateExportContext() 실패
+#: ../smime/lib/e-pkcs12.c:328
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "내보내기 컨텍스트를 만들 수 없습니다. 오류 코드: %i"
+
+# 주의 접근 키 아님
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "암호 완결성을 준비할 수 없습니다. 오류 코드: %i"
+
+# 주의 접근 키 아님
+#: ../smime/lib/e-pkcs12.c:345
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "안전 공간을 만들 수 없습니다. 오류 코드: %i"
+
+# 주의 접근 키 아님
+#: ../smime/lib/e-pkcs12.c:363
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "저장소에 키/인증서를 추가할 수 없습니다. 오류 코드: %i"
+
+# 주의 접근 키 아님
+#: ../smime/lib/e-pkcs12.c:381
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "디스크에 저장 내용을 쓸 수 없습니다. 오류 코드: %i"
+
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "가져온 인증서"
 


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