aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangwoo Ryu <cwryu@src.gnome.org>2004-01-31 23:17:38 +0800
committerChangwoo Ryu <cwryu@src.gnome.org>2004-01-31 23:17:38 +0800
commitc3c98de1305ed7c2f925aacd0621d933042e1815 (patch)
tree136c1a2b762fd3c5b8c9c4946b8cc169b0e7b271
parent50f070bcc5cff96131268ae99d8368df9a4b84b8 (diff)
downloadgsoc2013-evolution-c3c98de1305ed7c2f925aacd0621d933042e1815.tar.gz
gsoc2013-evolution-c3c98de1305ed7c2f925aacd0621d933042e1815.tar.zst
gsoc2013-evolution-c3c98de1305ed7c2f925aacd0621d933042e1815.zip
Updated Korean translation.
* ko.po: Updated Korean translation. svn path=/trunk/; revision=24556
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ko.po1185
2 files changed, 619 insertions, 570 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 289c29227f..7fd5478bec 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-01 Changwoo Ryu <cwryu@debian.org>
+
+ * ko.po: Updated Korean translation.
+
2004-01-31 Kjartan Maraas <kmaraas@gnome.org>
* no.po: Updated Norwegian translation.
diff --git a/po/ko.po b/po/ko.po
index 21da33d917..ce85377b8b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,15 +5,15 @@
# Changwoo Ryu <cwryu@debian.org>, 2003-2004.
msgid ""
msgstr ""
-"Project-Id-Version: evolution 1.5.2\n"
-"POT-Creation-Date: 2004-01-26 13:51-0500\n"
-"PO-Revision-Date: 2004-01-25 23:35+0900\n"
+"Project-Id-Version: evolution 1.5.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-01 00:06+0900\n"
+"PO-Revision-Date: 2004-02-01 00:16+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: addressbook/conduit/address-conduit.c:272
@@ -46,9 +46,10 @@ msgstr "여기서 자동 완성을 설정합니다"
#. can not get name, should be a bug of e-book.Anyway, should set a default name.
#.
#. name = e_book_get_name (book);
+#. Create the contacts group
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:341 mail/importers/netscape-importer.c:1844
+#: calendar/gui/migration.c:362 mail/importers/netscape-importer.c:1844
#: shell/e-shortcuts.c:1088
msgid "Contacts"
msgstr "연락처"
@@ -94,12 +95,12 @@ msgstr "여기서 s/MIME 인증서를 관리합니다"
msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
-#: addressbook/gui/component/addressbook-component.c:268
+#: addressbook/gui/component/addressbook-component.c:270
#: addressbook/gui/component/ldap-config.glade.h:28
msgid "New Addressbook"
msgstr "새 주소록"
-#: addressbook/gui/component/addressbook-component.c:269
+#: addressbook/gui/component/addressbook-component.c:271
#: addressbook/gui/widgets/e-addressbook-view.c:1046
#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
@@ -109,69 +110,69 @@ msgstr "새 주소록"
msgid "Delete"
msgstr "지우기"
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:272
#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
msgid "Properties..."
msgstr "등록 정보..."
-#: addressbook/gui/component/addressbook-component.c:341
+#: addressbook/gui/component/addressbook-component.c:343
msgid "New Contact"
msgstr "새 연락처"
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:344
msgid "_Contact"
msgstr "연락처(_C)"
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:345
msgid "Create a new contact"
msgstr "새로운 연락처를 만듭니다"
-#: addressbook/gui/component/addressbook-component.c:348
+#: addressbook/gui/component/addressbook-component.c:350
msgid "New Contact List"
msgstr "새 연락처 목록"
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:351
msgid "Contact _List"
msgstr "연락처 목록(_L)"
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:352
msgid "Create a new contact list"
msgstr "새 연락처 목록을 만듭니다"
-#: addressbook/gui/component/addressbook-config.c:391
+#: addressbook/gui/component/addressbook-config.c:397
msgid "Failed to connect to LDAP server"
msgstr "LDAP 서버에 연결 실패"
-#: addressbook/gui/component/addressbook-config.c:415
+#: addressbook/gui/component/addressbook-config.c:421
msgid "Failed to authenticate with LDAP server"
msgstr "LDAP 서버에서 인증 실패"
-#: addressbook/gui/component/addressbook-config.c:443
+#: addressbook/gui/component/addressbook-config.c:449
msgid "Could not perform query on Root DSE"
msgstr "루트 DSE에 질의를 수행할 수 없습니다"
-#: addressbook/gui/component/addressbook-config.c:767
+#: addressbook/gui/component/addressbook-config.c:773
msgid "The server responded with no supported search bases"
msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
-#: addressbook/gui/component/addressbook-config.c:1178
+#: addressbook/gui/component/addressbook-config.c:1184
msgid "This server does not support LDAPv3 schema information"
msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
-#: addressbook/gui/component/addressbook-config.c:1200
+#: addressbook/gui/component/addressbook-config.c:1206
msgid "Error retrieving schema information"
msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
-#: addressbook/gui/component/addressbook-config.c:1208
+#: addressbook/gui/component/addressbook-config.c:1214
msgid "Server did not respond with valid schema information"
msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
-#: addressbook/gui/component/addressbook-migrate.c:46
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1070
+#: addressbook/gui/component/addressbook-migrate.c:57
+#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
msgid "Migrating..."
msgstr "옮기는 중..."
-#: addressbook/gui/component/addressbook-migrate.c:54
+#: addressbook/gui/component/addressbook-migrate.c:65
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -182,38 +183,37 @@ msgstr ""
"\n"
"폴더를 옮기는 동안 잠시 기다리십시오..."
-#: addressbook/gui/component/addressbook-migrate.c:87
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1111
+#: addressbook/gui/component/addressbook-migrate.c:99
+#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
#, c-format
msgid "Migrating `%s':"
msgstr "`%s' 옮기는 중:"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:384
-#: calendar/gui/migration.c:378 calendar/gui/migration.c:443
+#: addressbook/gui/component/addressbook-migrate.c:406
+#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
msgid "On This Computer"
-msgstr "이 컴퓨터에"
+msgstr "이 컴퓨터"
+#. Create the default Person addressbook
#. orange
-#: addressbook/gui/component/addressbook-migrate.c:394
-#: addressbook/gui/component/addressbook-migrate.c:427
-#: calendar/gui/migration.c:391 calendar/gui/migration.c:456
-#: calendar/gui/migration.c:524 calendar/gui/migration.c:611
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:65
+#: addressbook/gui/component/addressbook-migrate.c:414
+#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
#: mail/mail-config.glade.h:90
msgid "Personal"
msgstr "개인"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:402
+#: addressbook/gui/component/addressbook-migrate.c:422
msgid "On LDAP Servers"
-msgstr "LDAP 서버에"
+msgstr "LDAP 서버"
-#: addressbook/gui/component/addressbook-migrate.c:529
+#: addressbook/gui/component/addressbook-migrate.c:551
msgid "LDAP Servers"
msgstr "LDAP 서버"
-#: addressbook/gui/component/addressbook-migrate.c:649
+#: addressbook/gui/component/addressbook-migrate.c:671
msgid "Autocompletion Settings"
msgstr "자동 완성 설정"
@@ -393,7 +393,7 @@ msgstr "주소록 등록 정보"
msgid "Addressbook Sources"
msgstr "주소록 원본"
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
#: mail/mail-config.glade.h:17
msgid "Always"
msgstr "항상"
@@ -406,12 +406,11 @@ msgstr "익명으로"
msgid ""
"Congratulations, you are finished setting up this addressbook.\n"
"\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
+"Please click the \"Apply\" button to save the settings you have entered here."
msgstr ""
"축하합니다. 이 주소록의 설정을 마쳤습니다.\n"
"\n"
-"입력한 설정 사항을 저장하려면 \"마침\" 단추를 누르십시오."
+"입력한 설정 사항을 저장하려면 \"적용\" 단추를 누르십시오."
#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Connecting"
@@ -451,7 +450,7 @@ msgstr "일반 정보"
msgid "Group:"
msgstr "그룹:"
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
#: mail/mail-config.glade.h:80
msgid "Never"
msgstr "항상 사용 않음"
@@ -480,8 +479,6 @@ msgid "S_earch scope: "
msgstr "찾기 범위(_E): "
#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:398 calendar/gui/e-cal-view.c:663
-#: calendar/gui/gnome-cal.c:586
msgid "Searching"
msgstr "찾는 중"
@@ -682,7 +679,7 @@ msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
msgid "Using email address"
msgstr "전자메일 주소 사용해서"
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
#: mail/mail-config.glade.h:136
msgid "Whenever Possible"
msgstr "가능하면 언제나"
@@ -868,7 +865,7 @@ msgstr "협력"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2013
+#: addressbook/gui/contact-editor/e-contact-editor.c:2020
msgid "Contact Editor"
msgstr "연락처 편집기"
@@ -961,9 +958,9 @@ msgstr "분류(_C)..."
#. FIXME: need to disable for undeletable folders
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-cal-view.c:1294 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:1773
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1259
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:1767
#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -1019,8 +1016,8 @@ msgstr "주소"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:242
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
#: addressbook/gui/widgets/e-addressbook-model.c:312
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
@@ -2003,7 +2000,7 @@ msgid "AOL Instant Messenger"
msgstr "AOL 인스턴스 메신저"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/contact-editor/e-contact-editor.c:2844
msgid "Jabber"
msgstr "Jabber"
@@ -2016,12 +2013,12 @@ msgid "MSN Messenger"
msgstr "MSN 메신저"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2840
+#: addressbook/gui/contact-editor/e-contact-editor.c:2847
msgid "ICQ"
msgstr "ICQ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:710
+#: addressbook/gui/contact-editor/e-contact-editor.c:711
msgid "Service"
msgstr "서비스"
@@ -2035,66 +2032,66 @@ msgid "Username"
msgstr "사용자이름"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2527
+#: addressbook/gui/contact-editor/e-contact-editor.c:2534
msgid "Home"
msgstr "집"
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:64
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
#: mail/mail-config.glade.h:137
msgid "Work"
msgstr "업무"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2528
+#: addressbook/gui/contact-editor/e-contact-editor.c:2535
msgid "Other"
msgstr "기타"
-#: addressbook/gui/contact-editor/e-contact-editor.c:207
+#: addressbook/gui/contact-editor/e-contact-editor.c:208
msgid "Source Book"
msgstr "원본 주소록"
-#: addressbook/gui/contact-editor/e-contact-editor.c:214
+#: addressbook/gui/contact-editor/e-contact-editor.c:215
msgid "Target Book"
msgstr "대상 주소록"
-#: addressbook/gui/contact-editor/e-contact-editor.c:221
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:189
msgid "Contact"
msgstr "연락처"
-#: addressbook/gui/contact-editor/e-contact-editor.c:228
+#: addressbook/gui/contact-editor/e-contact-editor.c:229
msgid "Is New Contact"
msgstr "새 연락처"
-#: addressbook/gui/contact-editor/e-contact-editor.c:235
+#: addressbook/gui/contact-editor/e-contact-editor.c:236
msgid "Writable Fields"
msgstr "쓰기 가능한 필드"
-#: addressbook/gui/contact-editor/e-contact-editor.c:249
+#: addressbook/gui/contact-editor/e-contact-editor.c:250
msgid "Changed"
msgstr "변경됨"
-#: addressbook/gui/contact-editor/e-contact-editor.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:725
msgid "Account Name"
msgstr "계정 이름"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/contact-editor/e-contact-editor.c:1454
msgid "Category editor not available."
msgstr "분류 편집기를 사용할 수 없습니다."
-#: addressbook/gui/contact-editor/e-contact-editor.c:1455
+#: addressbook/gui/contact-editor/e-contact-editor.c:1462
msgid "This contact belongs to these categories:"
msgstr "이 연락처는 다음 분류에 속합니다:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1678
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
msgid "Save Contact as VCard"
msgstr "VCard로 연락처를 저장"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2102,7 +2099,7 @@ msgstr ""
"정말로 이 계정을\n"
"지우시겠습니까?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -2110,24 +2107,24 @@ msgstr ""
"정말로 이 연락처를\n"
"지우시겠습니까?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2526
+#: addressbook/gui/contact-editor/e-contact-editor.c:2533
msgid "Business"
msgstr "직장"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2843
msgid "AIM"
msgstr "AIM"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/contact-editor/e-contact-editor.c:2845
msgid "Yahoo"
msgstr "야후"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2839
+#: addressbook/gui/contact-editor/e-contact-editor.c:2846
msgid "MSN"
msgstr "MSN"
# 일어나지 않을 것 같은 오류 메세지
-#: addressbook/gui/contact-editor/e-contact-editor.c:3127
+#: addressbook/gui/contact-editor/e-contact-editor.c:3134
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "필드에 대한 위젯을 찾을 수 없습니다: `%s'"
@@ -2287,7 +2284,7 @@ msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌
msgid "contact-list-editor"
msgstr "연락처 목록 편집기"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
#: addressbook/gui/widgets/e-addressbook-model.c:298
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:206
@@ -2296,16 +2293,16 @@ msgstr "연락처 목록 편집기"
msgid "Book"
msgstr "북"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
msgid "Is New List"
msgstr "새 목록"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
msgid "Contact List Editor"
msgstr "연락처 목록 편집기"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
msgid "Save List as VCard"
msgstr "VCard로 목록 저장"
@@ -2348,7 +2345,7 @@ msgstr ""
#. FIXME: get the toplevel window...
#: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:148
+#: widgets/misc/e-filter-bar.c:154
msgid "Advanced Search"
msgstr "고급 찾기"
@@ -2492,7 +2489,7 @@ msgstr "잘라내기"
#. create the dialog
#: addressbook/gui/widgets/e-addressbook-view.c:1044
#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:136
+#: calendar/gui/dialogs/copy-source-dialog.c:158
#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -2504,7 +2501,7 @@ msgid "Paste"
msgstr "붙여 넣기"
#: addressbook/gui/widgets/e-addressbook-view.c:1050
-#: calendar/gui/e-cal-view.c:1232
+#: calendar/gui/e-cal-view.c:1228
msgid "Current View"
msgstr "현재 보기"
@@ -2800,104 +2797,104 @@ msgstr "홈페이지"
msgid "Blog"
msgstr "블로그"
-#: addressbook/gui/widgets/eab-gui-util.c:43
+#: addressbook/gui/widgets/eab-gui-util.c:46
msgid "Success"
msgstr "성공했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:44
+#: addressbook/gui/widgets/eab-gui-util.c:47
#: camel/providers/imap/camel-imap-command.c:306
#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:547 shell/e-shell.c:1002
+#: camel/providers/pop3/camel-pop3-store.c:547 shell/e-shell.c:1076
msgid "Unknown error"
msgstr "알 수 없는 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:45
+#: addressbook/gui/widgets/eab-gui-util.c:48
msgid "Repository offline"
msgstr "저장고가 연결되지 않았습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Permission denied"
msgstr "권한이 거부되었습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Contact not found"
msgstr "연락처를 찾을 수 없습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Contact ID already exists"
msgstr "연락처 ID가 이미 있습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Protocol not supported"
msgstr "프로토콜이 지원되지 않습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:53
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2349 camel/camel-service.c:734
-#: camel/camel-service.c:772 camel/camel-service.c:856
-#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
+#: camel/camel-service.c:766 camel/camel-service.c:850
+#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:453
#: camel/providers/pop3/camel-pop3-store.c:534
msgid "Cancelled"
msgstr "취소됨"
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:54
msgid "Authentication Failed"
msgstr "인증이 실패했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:55
msgid "Authentication Required"
msgstr "인증이 필요합니다"
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "TLS not Available"
msgstr "TLS를 사용할 수 없습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "Addressbook does not exist"
msgstr "주소록이 없습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Other error"
msgstr "다른 오류"
-#: addressbook/gui/widgets/eab-gui-util.c:82
+#: addressbook/gui/widgets/eab-gui-util.c:85
msgid "Do you want to save changes?"
msgstr "바뀐 부분을 저장하시겠습니까?"
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:87
msgid "_Discard"
msgstr "버리기(_D)"
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:106
msgid "Error adding list"
msgstr "목록을 더하는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:103
-#: addressbook/gui/widgets/eab-gui-util.c:457
+#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:524
msgid "Error adding contact"
msgstr "연락처를 더하는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:112
+#: addressbook/gui/widgets/eab-gui-util.c:115
msgid "Error modifying list"
msgstr "목록을 고치는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:112
+#: addressbook/gui/widgets/eab-gui-util.c:115
msgid "Error modifying contact"
msgstr "연락처를 고치는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:125
msgid "Error removing list"
msgstr "목록을 지우는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:122
-#: addressbook/gui/widgets/eab-gui-util.c:415
+#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:482
msgid "Error removing contact"
msgstr "연락처를 지우는 중 오류가 발생했습니다"
-#: addressbook/gui/widgets/eab-gui-util.c:204
+#: addressbook/gui/widgets/eab-gui-util.c:207
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2906,7 +2903,7 @@ msgstr ""
"연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
"정말로 이 연락처를 전부 여시겠습니까?"
-#: addressbook/gui/widgets/eab-gui-util.c:230
+#: addressbook/gui/widgets/eab-gui-util.c:233
#, c-format
msgid ""
"%s already exists\n"
@@ -2915,47 +2912,51 @@ msgstr ""
"%s이(가) 이미 존재합니다\n"
"이 파일을 덮어 쓰시겠습니까?"
-#: addressbook/gui/widgets/eab-gui-util.c:234
+#: addressbook/gui/widgets/eab-gui-util.c:237
msgid "Overwrite"
msgstr "덮어 쓰기"
-#: addressbook/gui/widgets/eab-gui-util.c:270
+#: addressbook/gui/widgets/eab-gui-util.c:273
#, c-format
msgid "Error saving %s: %s"
msgstr "%s을(를) 저장하는 데 오류가 발생했습니다: %s"
# 파일 이름
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:307
+#: addressbook/gui/widgets/eab-gui-util.c:310
msgid "card.vcf"
msgstr "카드.vcf"
# 파일 이름
-#: addressbook/gui/widgets/eab-gui-util.c:376
+#: addressbook/gui/widgets/eab-gui-util.c:443
msgid "list"
msgstr "목록"
-#: addressbook/gui/widgets/eab-gui-util.c:513
+#: addressbook/gui/widgets/eab-gui-util.c:578
msgid "Move contact to"
msgstr "연락처 이동"
-#: addressbook/gui/widgets/eab-gui-util.c:515
+#: addressbook/gui/widgets/eab-gui-util.c:580
msgid "Copy contact to"
msgstr "연락처 복사"
-#: addressbook/gui/widgets/eab-gui-util.c:518
+#: addressbook/gui/widgets/eab-gui-util.c:583
msgid "Move contacts to"
msgstr "연락처 이동"
-#: addressbook/gui/widgets/eab-gui-util.c:520
+#: addressbook/gui/widgets/eab-gui-util.c:585
msgid "Copy contacts to"
msgstr "연락처 복사"
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:588
+msgid "Select target addressbook."
+msgstr "어디로 갈지 주소록을 선택하십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:767
msgid "Multiple VCards"
msgstr "여러 개 VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:770
#, c-format
msgid "VCard for %s"
msgstr "%s에 대한 VCard"
@@ -3030,19 +3031,19 @@ msgid "GTK Tree View"
msgstr "GTk 트리 뷰"
# 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr "Reflow 테스트"
# 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
# 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr "reflow canvas item을 테스트합니다"
@@ -3456,8 +3457,8 @@ msgstr "연기할 시간 (분)"
msgid "_Edit appointment"
msgstr "약속 편집(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1245
-#: calendar/gui/e-cal-view.c:1310 calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1241
+#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1037
#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:711
#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
msgid "_Open"
@@ -3690,11 +3691,11 @@ msgstr "설명에 포함"
msgid "Comment contains"
msgstr "주석에 포함"
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1105
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
msgid "Unmatched"
msgstr "맞지 않음"
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1608
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
msgid "Calendar"
msgstr "달력"
@@ -3727,6 +3728,10 @@ 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/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
@@ -4570,8 +4575,8 @@ msgstr "일지 항목 - %s"
msgid "No summary"
msgstr "요약 없음"
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1046
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1130
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1042
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
msgid "Save as..."
msgstr "다른 이름으로 저장..."
@@ -4585,9 +4590,21 @@ msgstr "업데이트가 도착하면 이 항목에 대해 변경된 사항을
msgid "Unable to use current version!"
msgstr "현재 버전을 사용할 수 없습니다!"
-#: calendar/gui/dialogs/copy-source-dialog.c:142
+#: calendar/gui/dialogs/copy-source-dialog.c:83
+msgid "Could not open source"
+msgstr "소스를 열 수 없습니다"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:91
+msgid "Could not open destination"
+msgstr "받을 곳을 열 수 없습니다"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:100
+msgid "Destination is read only"
+msgstr "받을 곳이 읽기 전용입니다"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:164
msgid "Select destination source"
-msgstr "대상이 될 원본을 선택하십시오"
+msgstr "받을 곳 소스를 선택하십시오"
#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
@@ -4816,11 +4833,16 @@ msgid "_Start time:"
msgstr "시작 시각(_S):"
#. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2068
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
#: mail/em-account-prefs.c:448 mail/em-folder-view.c:745
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
#: mail/mail-config.glade.h:82
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
@@ -5110,7 +5132,7 @@ msgstr ""
"\n"
"바뀐 내용을 저장하시겠습니까?"
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1547
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
msgid "_Discard Changes"
msgstr "바뀐 내용 버리기(_D)"
@@ -5146,8 +5168,7 @@ msgstr "% 완료(_C)"
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
#: calendar/gui/print.c:2346
msgid "Completed"
@@ -5155,7 +5176,7 @@ msgstr "완료됨"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:919
+#: mail/message-list.c:939
msgid "High"
msgstr "높음"
@@ -5168,13 +5189,13 @@ msgstr "진행중"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:917
+#: mail/message-list.c:937
msgid "Low"
msgstr "낮음"
#: calendar/gui/dialogs/task-details-page.glade.h:8
#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:938
msgid "Normal"
msgstr "보통"
@@ -5474,16 +5495,13 @@ msgstr ""
"45.436845,125.862501"
#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
-#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "예"
#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
-#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "아니오"
@@ -5491,14 +5509,12 @@ msgstr "아니오"
#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
#: calendar/gui/e-itip-control.c:979 calendar/gui/e-itip-control.c:1181
#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
-#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
-#: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1664
-#: camel/camel-gpg-context.c:1715 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2096
#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
msgid "Unknown"
msgstr "알 수 없음"
@@ -5511,33 +5527,33 @@ msgstr "반복됨"
msgid "Assigned"
msgstr "예약됨"
-#: calendar/gui/e-cal-view.c:684 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
msgid "Deleting selected objects"
msgstr "선택한 오브젝트를 지우는 중입니다"
-#: calendar/gui/e-cal-view.c:788 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:784 calendar/gui/e-calendar-table.c:861
msgid "Updating objects"
msgstr "오브젝트를 업데이트하는 중입니다"
-#: calendar/gui/e-cal-view.c:1217 calendar/gui/e-cal-view.c:1302
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1298
msgid "New _Appointment..."
msgstr "새 약속(_A)..."
# event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1304
+#: calendar/gui/e-cal-view.c:1214 calendar/gui/e-cal-view.c:1300
msgid "New All Day _Event"
msgstr "새 하루 종일 행사(_E)"
-#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1306
+#: calendar/gui/e-cal-view.c:1215 calendar/gui/e-cal-view.c:1302
msgid "New Meeting"
msgstr "새 모임"
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1304
msgid "New Task"
msgstr "새 작업"
-#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1247
-#: calendar/gui/e-cal-view.c:1314 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1243
+#: calendar/gui/e-cal-view.c:1310 calendar/gui/e-calendar-table.c:1040
#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
@@ -5545,67 +5561,67 @@ msgstr "새 작업"
msgid "_Print..."
msgstr "인쇄(_P)..."
-#: calendar/gui/e-cal-view.c:1228 calendar/gui/e-cal-view.c:1254
-#: calendar/gui/e-cal-view.c:1312 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1308 calendar/gui/e-calendar-table.c:1046
#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
msgid "_Paste"
msgstr "붙여 넣기(_P)"
-#: calendar/gui/e-cal-view.c:1234 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1230 calendar/gui/e-cal-view.c:1294
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr "오늘로 이동(_T)"
-#: calendar/gui/e-cal-view.c:1235 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1231 calendar/gui/e-cal-view.c:1296
msgid "_Go to Date..."
msgstr "날짜로 이동(_G)..."
# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-cal-view.c:1239 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1235 ui/evolution-calendar.xml.h:40
msgid "_Publish Free/Busy Information"
msgstr "약속 있음/없음 정보 게시(_P)"
-#: calendar/gui/e-cal-view.c:1246 calendar/gui/e-cal-view.c:1316
+#: calendar/gui/e-cal-view.c:1242 calendar/gui/e-cal-view.c:1312
#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
#: mail/em-folder-view.c:713 mail/em-popup.c:659 mail/em-popup.c:774
#: ui/evolution-mail-message.xml.h:126
msgid "_Save As..."
msgstr "다른 이름으로 저장(_S)..."
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1248 calendar/gui/e-cal-view.c:1288
#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "잘라내기(_U)"
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1249 calendar/gui/e-cal-view.c:1286
#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:1766 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:1760 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
msgid "_Copy"
msgstr "복사(_C)"
-#: calendar/gui/e-cal-view.c:1258
+#: calendar/gui/e-cal-view.c:1254
msgid "_Schedule Meeting..."
msgstr "모임 일정(_S)..."
-#: calendar/gui/e-cal-view.c:1259
+#: calendar/gui/e-cal-view.c:1255
msgid "_Forward as iCalendar..."
msgstr "iCalendar로 전달(_F)..."
-#: calendar/gui/e-cal-view.c:1264 calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1260 calendar/gui/e-cal-view.c:1291
msgid "Delete this _Occurrence"
msgstr "이 경우를 지웁니다(_O)"
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1292
msgid "Delete _All Occurrences"
msgstr "모든 경우를 지웁니다(_A)"
-#: calendar/gui/e-cal-view.c:1318 ui/evolution.xml.h:32
+#: calendar/gui/e-cal-view.c:1314 ui/evolution.xml.h:33
msgid "_Settings..."
msgstr "설정(_S)..."
@@ -5693,7 +5709,7 @@ msgid "Alarms"
msgstr "알림"
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:578
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
msgid "Complete"
msgstr "완료"
@@ -5722,12 +5738,20 @@ msgid "URL"
msgstr "URL"
#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
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.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5751,6 +5775,10 @@ msgstr "%02i분 단위"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %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-day-view-top-item.c:688 calendar/gui/e-day-view.c:1348
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1519
msgid "%A %d %B"
@@ -5758,6 +5786,9 @@ msgstr "%B %d일 %A"
#. 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-day-view-top-item.c:696 calendar/gui/e-day-view.c:1381
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
@@ -5904,9 +5935,8 @@ msgid "Status:"
msgstr "상태:"
#: calendar/gui/e-itip-control.c:967 calendar/gui/e-meeting-list-view.c:180
-#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
-#: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "수락"
@@ -5915,10 +5945,8 @@ msgid "Tentatively Accepted"
msgstr "잠정적으로 수락"
#: calendar/gui/e-itip-control.c:975 calendar/gui/e-meeting-list-view.c:181
-#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
-#: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:428
-#: calendar/gui/itip-utils.c:454
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "거부"
@@ -5935,7 +5963,7 @@ msgstr "업데이트"
#: calendar/gui/e-itip-control.c:1036 calendar/gui/e-itip-control.c:1067
#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1103
#: calendar/gui/e-itip-control.c:1116 calendar/gui/e-itip-control.c:1129
-#: shell/e-shell.c:992 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1066 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "확인"
@@ -5965,7 +5993,7 @@ msgid "Send Latest Information"
msgstr "가장 최근 정보 보내기"
#: calendar/gui/e-itip-control.c:1128 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "취소"
@@ -6251,95 +6279,78 @@ msgstr "끝-날짜"
msgid "date-start"
msgstr "시작-날짜"
-#: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Chair Persons"
msgstr "의장"
#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479 calendar/gui/e-meeting-model.c:78
-#: calendar/gui/e-meeting-model.c:1635
+#: calendar/gui/e-meeting-list-view.c:479
msgid "Required Participants"
msgstr "필수 참석자"
-#: calendar/gui/e-meeting-list-view.c:64 calendar/gui/e-meeting-model.c:79
+#: calendar/gui/e-meeting-list-view.c:64
msgid "Optional Participants"
msgstr "선택 참석자"
-#: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80
+#: calendar/gui/e-meeting-list-view.c:65
msgid "Resources"
msgstr "자원"
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-model.c:192
-#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:525
-#: calendar/gui/e-meeting-model.c:750 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "개인"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-model.c:194
-#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:751
-#: calendar/gui/e-meeting-store.c:92 calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "그룹"
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-model.c:196
-#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:752
-#: calendar/gui/e-meeting-store.c:94 calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "자원"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-model.c:198
-#: calendar/gui/e-meeting-model.c:215 calendar/gui/e-meeting-model.c:753
-#: calendar/gui/e-meeting-store.c:96 calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "방"
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-model.c:227
-#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:766
-#: calendar/gui/e-meeting-store.c:125 calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "의장"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-model.c:229
-#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:527
-#: calendar/gui/e-meeting-model.c:767 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "필수 참석자"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-model.c:231
-#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:768
-#: calendar/gui/e-meeting-store.c:129 calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "선택 참석자"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-model.c:233
-#: calendar/gui/e-meeting-model.c:250 calendar/gui/e-meeting-model.c:769
-#: calendar/gui/e-meeting-store.c:131 calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "불참자"
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-model.c:279
-#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:535
-#: calendar/gui/e-meeting-model.c:795 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "동작 필요"
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/e-meeting-store.c:183 calendar/gui/e-meeting-store.c:206
-#: calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "잠정적"
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/e-meeting-store.c:185 calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "대리"
-#: calendar/gui/e-meeting-model.c:291 calendar/gui/e-meeting-model.c:314
#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
msgid "In Process"
msgstr "진행중"
@@ -6353,6 +6364,10 @@ msgstr "%Y년 %B %d일 %A"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel-item.c:456
#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6361,6 +6376,10 @@ msgstr "%Y/%m/%d %a"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
msgid "%m/%d/%Y"
@@ -6451,7 +6470,7 @@ msgstr "웹 페이지:"
msgid "Click to open %s"
msgstr "URL %s을(를) 열려면 누르십시오"
-#: calendar/gui/e-tasks.c:747 calendar/gui/gnome-cal.c:1892
+#: calendar/gui/e-tasks.c:747 calendar/gui/gnome-cal.c:1887
#, c-format
msgid ""
"Error on %s:\n"
@@ -6461,7 +6480,7 @@ msgstr ""
" %s"
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:766 calendar/gui/gnome-cal.c:1913
+#: calendar/gui/e-tasks.c:766 calendar/gui/gnome-cal.c:1908
#, c-format
msgid ""
"The task backend for\n"
@@ -6501,17 +6520,17 @@ msgstr "선택한 오브젝트를 지웁니다..."
msgid "Expunging"
msgstr "지운 메세지 비우는 중"
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1752
#, c-format
msgid "Opening %s"
msgstr "%s 여는 중입니다"
-#: calendar/gui/gnome-cal.c:1768
+#: calendar/gui/gnome-cal.c:1763
#, c-format
msgid "Could not open '%s': %s"
msgstr "'%s'을(를) 열 수 없습니다: %s"
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1916
#, c-format
msgid ""
"The calendar backend for\n"
@@ -6521,7 +6540,7 @@ msgstr ""
"다음에 대한 달력 벡엔드가 비정상적으로 죽었습니다:\n"
"%s"
-#: calendar/gui/gnome-cal.c:2808
+#: calendar/gui/gnome-cal.c:2803
msgid "Purging"
msgstr "비우는 중"
@@ -6667,14 +6686,14 @@ msgstr ""
"\n"
"폴더를 옮기는 동안 잠시 기다리십시오..."
-#: calendar/gui/migration.c:345
+#: calendar/gui/migration.c:365
msgid "Birthdays & Anniversaries"
msgstr "생일 및 기념일"
-#. Create the web group
-#: calendar/gui/migration.c:400
+#. Create the Webcal source group
+#: calendar/gui/migration.c:441
msgid "On The Web"
-msgstr "웹에"
+msgstr "웹"
#: calendar/gui/print.c:500
msgid "1st"
@@ -8796,7 +8815,7 @@ msgstr ""
#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
msgid "Cancelled."
msgstr "취소됨."
@@ -9245,55 +9264,55 @@ msgstr "POP이 아닌 원본을 사용해 SMTP 인증 전에 POP"
msgid "Regular expression compilation failed: %s: %s"
msgstr "정규식 컴파일이 실패했습니다: %s: %s"
-#: camel/camel-service.c:278
+#: camel/camel-service.c:275
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s'에 사용자이름 부분이 필요합니다"
-#: camel/camel-service.c:286
+#: camel/camel-service.c:279
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s'에 호스트 부분이 필요합니다"
-#: camel/camel-service.c:294
+#: camel/camel-service.c:283
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s'에 경로 부분이 필요합니다"
-#: camel/camel-service.c:739
+#: camel/camel-service.c:733
#, c-format
msgid "Resolving: %s"
msgstr "호스트 찾는 중입니다: %s"
-#: camel/camel-service.c:770 camel/camel-service.c:894
+#: camel/camel-service.c:764 camel/camel-service.c:888
#, c-format
msgid "Failure in name lookup: %s"
msgstr "호스트 이름을 찾는 데 실패했습니다: %s"
-#: camel/camel-service.c:791 camel/camel-service.c:915
+#: camel/camel-service.c:785 camel/camel-service.c:909
#, c-format
msgid "Host lookup failed: cannot create thread: %s"
msgstr "호스트 이름 찾기가 실패했습니다: 쓰레드를 만들 수 없습니다: %s"
-#: camel/camel-service.c:804
+#: camel/camel-service.c:798
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "호스트 이름 찾기가 실패했습니다: %s: 호스트를 찾을 수 없습니다"
-#: camel/camel-service.c:807
+#: camel/camel-service.c:801
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "호스트 이름 찾기가 실패했습니다: %s: 알 수 없는 원인"
-#: camel/camel-service.c:861
+#: camel/camel-service.c:855
msgid "Resolving address"
msgstr "주소 찾는 중"
-#: camel/camel-service.c:930
+#: camel/camel-service.c:924
msgid "Host lookup failed: host not found"
msgstr "호스트 이름 찾기가 실패했습니다: 호스트 이름을 찾을 수 없습니다"
-#: camel/camel-service.c:933
+#: camel/camel-service.c:927
msgid "Host lookup failed: unknown reason"
msgstr "호스트 이름 찾기가 실패했습니다: 알 수 없는 원인"
@@ -9310,7 +9329,7 @@ msgstr "다른 여러 메일 폴더의 질의 결과물을 읽기"
msgid "No provider available for protocol `%s'"
msgstr "프로토콜 `%s'에 대한 제공자가 없습니다"
-#: camel/camel-session.c:524
+#: camel/camel-session.c:523
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -9377,15 +9396,15 @@ msgstr "폴더를 얻을 수 없습니다: 이 저장고에 잘못된 동작입
msgid "Cannot create folder: Invalid operation on this store"
msgstr "폴더를 만들 수 없습니다: 이 저장고에 잘못된 동작입니다"
-#: camel/camel-store.c:792 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1125
+#: camel/camel-store.c:796 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1129
msgid "Trash"
msgstr "휴지통"
-#: camel/camel-store.c:794 filter/libfilter-i18n.h:35 mail/mail-ops.c:1129
+#: camel/camel-store.c:798 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
#: ui/evolution-mail-message.xml.h:46
msgid "Junk"
-msgstr "쓰레기"
+msgstr "정크메일"
#: camel/camel-tcp-stream-openssl.c:568
msgid "Unable to get issuer's certificate"
@@ -9595,7 +9614,7 @@ msgstr ""
"인증서 취소 목록이 만료되었습니다: %s\n"
"발급자: %s"
-#: camel/camel-url.c:290 mail/mail-tools.c:138
+#: camel/camel-url.c:290
#, c-format
msgid "Could not parse URL `%s'"
msgstr "`%s' URL을 파싱할 수 없습니다"
@@ -9670,8 +9689,8 @@ msgid "Novell GroupWise"
msgstr "Novell GroupWise"
#: camel/providers/groupwise/camel-groupwise-provider.c:85
-msgid "For accesing Novell Groupwise servers"
-msgstr "Novell GroupWise 서버에 접근합니다"
+msgid "For accessing Novell Groupwise servers"
+msgstr "Novell GroupWise 서버에 접근하는 용도"
#: camel/providers/groupwise/camel-groupwise-provider.c:100
#: camel/providers/imap/camel-imap-provider.c:89
@@ -9688,8 +9707,8 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
#. default charset used in mail view
-#: camel/providers/groupwise/camel-gw-listener.c:298
#: camel/providers/groupwise/camel-gw-listener.c:299
+#: camel/providers/groupwise/camel-gw-listener.c:300
#: mail/em-folder-view.c:1542 mail/em-folder-view.c:1580
#: mail/mail-config.glade.h:42
msgid "Default"
@@ -9752,21 +9771,21 @@ msgstr "%s 디렉토리를 만들 수 없습니다: %s"
msgid "Could not load summary for %s"
msgstr "%s에 대한 요약을 읽어들일 수 없습니다"
-#: camel/providers/imap/camel-imap-folder.c:317
+#: camel/providers/imap/camel-imap-folder.c:320
msgid "Folder was destroyed and recreated on server."
msgstr "폴더가 지워지고 서버에서 다시 만들어졌습니다."
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:563
+#: camel/providers/imap/camel-imap-folder.c:566
msgid "Scanning for changed messages"
msgstr "변경된 메세지를 검사합니다"
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1913
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "메세지를 가져올 수 없습니다: %s"
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1944
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9782,25 +9801,25 @@ msgstr ""
"메세지를 얻을 수 없습니다: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1944
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr "그런 메세지 없음"
-#: camel/providers/imap/camel-imap-folder.c:1964
-#: camel/providers/imap/camel-imap-folder.c:2560
+#: camel/providers/imap/camel-imap-folder.c:1967
+#: camel/providers/imap/camel-imap-folder.c:2569
#: camel/providers/nntp/camel-nntp-folder.c:205
msgid "This message is not currently available"
msgstr "이 메시지는 현재 보여줄 수가 없습니다"
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2227
+#: camel/providers/imap/camel-imap-folder.c:2297
msgid "Fetching summary information for new messages"
msgstr "새 메세지의 목록 정보를 가져오는 중입니다"
-#: camel/providers/imap/camel-imap-folder.c:2598
+#: camel/providers/imap/camel-imap-folder.c:2607
msgid "Could not find message body in FETCH response."
msgstr "FETCH 응답에서 메세지 본문을 찾을 수 없습니다."
@@ -10113,7 +10132,7 @@ msgid "Could not rename folder %s to %s: %s"
msgstr "%s 폴더의 이름을 %s(으)로 바꿀 수 없습니다: %s"
#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:501
+#: camel/providers/local/camel-mbox-store.c:533
#, c-format
msgid "Could not rename '%s': %s"
msgstr "'%s'의 이름을 바꿀 수 없습니다: %s"
@@ -10349,6 +10368,11 @@ msgstr "%s에서 %s(으)로 이름을 바꿀 수 없습니다: %s"
msgid "The new folder name is illegal."
msgstr "새 폴더의 이름이 올바르지 않습니다."
+#: camel/providers/local/camel-mbox-store.c:467
+#, c-format
+msgid "Could not rename `%s': `%s': %s"
+msgstr "`%s'의 이름을 바꿀 수 없습니다: `%s': %s"
+
#: camel/providers/local/camel-mbox-summary.c:343
#, c-format
msgid "Could not open folder: %s: %s"
@@ -10388,7 +10412,7 @@ msgstr "원본 폴더 %s을(를) 닫을 수 없습니다: %s"
msgid "Could not close temp folder: %s"
msgstr "임시 폴더를 닫을 수 없음: %s"
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1527
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1521
#, c-format
msgid "Could not rename folder: %s"
msgstr "폴더 이름을 바꿀 수 없습니다: %s"
@@ -10507,7 +10531,7 @@ msgstr ""
"폴더가 망가졌을 것입니다. `%s'에 사본을 저장합니다"
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:998
+#: camel/providers/nntp/camel-nntp-store.c:997
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "%s@%s에 대한 NNTP 열쇠글을 입력하십시오"
@@ -10644,11 +10668,11 @@ msgstr "NNTP 서버 %s에서 오류 코드 %d을(를) 리턴했습니다: %s"
msgid "USENET News via %s"
msgstr "%s 서버를 통한 USENET 뉴스"
-#: camel/providers/nntp/camel-nntp-store.c:641
+#: camel/providers/nntp/camel-nntp-store.c:640
msgid "Stream error"
msgstr "스트림 오류"
-#: camel/providers/nntp/camel-nntp-store.c:644
+#: camel/providers/nntp/camel-nntp-store.c:643
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -10659,7 +10683,7 @@ msgstr ""
"\n"
"%s"
-#: camel/providers/nntp/camel-nntp-store.c:736
+#: camel/providers/nntp/camel-nntp-store.c:735
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -10669,7 +10693,7 @@ msgstr ""
"\n"
"그런 뉴스그룹이 없습니다. 선택한 항목이 상위 폴더일 것입니다."
-#: camel/providers/nntp/camel-nntp-store.c:768
+#: camel/providers/nntp/camel-nntp-store.c:767
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -10679,15 +10703,15 @@ msgstr ""
"\n"
"뉴스그룹이 없습니다!"
-#: camel/providers/nntp/camel-nntp-store.c:793
+#: camel/providers/nntp/camel-nntp-store.c:792
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "뉴스 저장고에 폴더를 만들 수 없습니다: 대신에 구독하십시오."
-#: camel/providers/nntp/camel-nntp-store.c:801
+#: camel/providers/nntp/camel-nntp-store.c:800
msgid "You cannot rename a folder in a News store."
msgstr "뉴스 저장고의 폴더의 이름을 바꿀 수 없습니다."
-#: camel/providers/nntp/camel-nntp-store.c:809
+#: camel/providers/nntp/camel-nntp-store.c:808
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "뉴스 저장고의 폴더를 지울 수 없습니다: 대신에 구독 해제하십시오."
@@ -11083,7 +11107,7 @@ msgstr "%s 서버를 통한 SMTP 메일"
msgid "Cannot send message: sender address not valid."
msgstr "메세지를 보낼 수 없습니다; 보내는 사람 주소가 올바르지 않습니다."
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:611
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
msgid "Sending message"
msgstr "메세지를 보냄"
@@ -11205,7 +11229,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1475
msgid "attachment"
msgstr "첨부"
@@ -11358,30 +11382,30 @@ msgstr ""
"%s 파일을 읽는 중 오류 발생:\n"
"%s"
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1161
msgid "File exists, overwrite?"
msgstr "파일이 있습니다, 덮어쓰시겠습니까?"
-#: composer/e-msg-composer.c:1156 composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
#, c-format
msgid "Error saving file: %s"
msgstr "파일 저장 중 오류 발생: %s"
-#: composer/e-msg-composer.c:1196
+#: composer/e-msg-composer.c:1212
#, c-format
msgid "Error loading file: %s"
msgstr "파일을 읽는 데 오류 발생: %s"
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1250
#, c-format
msgid "Error accessing file: %s"
msgstr "파일 접근하는 데 오류 발생: %s"
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1258
msgid "Unable to retrieve message from editor"
msgstr "편집기에서 메세지를 가져올 수 없습니다"
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1265
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -11390,7 +11414,7 @@ msgstr ""
"파일에서 찾을 수 없습니다: %s\n"
" %s"
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -11399,7 +11423,7 @@ msgstr ""
"파일을 잘라낼 수 없습니다: %s\n"
" %s"
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1281
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
@@ -11408,7 +11432,7 @@ msgstr ""
"파일 디스크립터를 복사할 수가 없습니다: %s\n"
" %s"
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1290
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -11417,7 +11441,7 @@ msgstr ""
"메세지를 자동 저장하는데 오류가 발생했습니다: %s\n"
" %s"
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1394
msgid ""
"Ximian Evolution has found unsaved messages from a previous session.\n"
"Would you like to try to recover them?"
@@ -11425,7 +11449,7 @@ msgstr ""
"Ximian Evolution의 이전 세션에서 저장하지 않은 파일을 발견했습니다.\n"
"이 파일을 복구하시겠습니까?"
-#: composer/e-msg-composer.c:1542
+#: composer/e-msg-composer.c:1558
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -11436,42 +11460,42 @@ msgstr ""
"\n"
"바뀐 내용을 저장하시겠습니까?"
-#: composer/e-msg-composer.c:1551
+#: composer/e-msg-composer.c:1567
msgid "Warning: Modified Message"
msgstr "경고: 바뀐 메세지"
-#: composer/e-msg-composer.c:1584
+#: composer/e-msg-composer.c:1600
msgid "Open file"
msgstr "파일 열기"
-#: composer/e-msg-composer.c:2029
+#: composer/e-msg-composer.c:2045
msgid "Signature:"
msgstr "서명:"
-#: composer/e-msg-composer.c:2069 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
msgid "Autogenerated"
msgstr "자동으로 만들기"
-#: composer/e-msg-composer.c:2247
+#: composer/e-msg-composer.c:2263
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] "<b>%d</b>개의 파일이 첨부되었습니다"
-#: composer/e-msg-composer.c:2276
+#: composer/e-msg-composer.c:2292
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
-#: composer/e-msg-composer.c:2279 composer/e-msg-composer.c:3138
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3154
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
-#: composer/e-msg-composer.c:2296 composer/e-msg-composer.c:3022
-#: composer/e-msg-composer.c:3023
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3038
+#: composer/e-msg-composer.c:3039
msgid "Compose a message"
msgstr "메일 메세지를 작성합니다"
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:3070
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -11479,7 +11503,7 @@ msgstr ""
"편지 작성 창을 만들 수 없습니다:\n"
"주소 선택 컨트롤을 활성화할 수 없습니다."
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3099
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -11491,7 +11515,7 @@ msgstr ""
"올바른 버전의 gtkhtml과 libgtkhtml이\n"
"설치되었는 지 확인하십시오.\n"
-#: composer/e-msg-composer.c:3184
+#: composer/e-msg-composer.c:3199
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -11499,7 +11523,7 @@ msgstr ""
"편지 작성 창을 만들 수 없습니다:\n"
"HTML 편집기 컴포넌트를 활성화할 수 없습니다."
-#: composer/e-msg-composer.c:4210
+#: composer/e-msg-composer.c:4220
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11662,12 +11686,16 @@ msgstr "동기화 분류:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d %a %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d %a %H:%M"
@@ -11719,23 +11747,31 @@ msgid "%m/%d/%Y %H"
msgstr "%Y/%m/%d %H"
#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%p %I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
msgid "%H:%M"
@@ -11858,7 +11894,7 @@ msgid "You must specify a folder."
msgstr "폴더를 지정해야 합니다."
#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
-#: mail/mail-account-gui.c:1099
+#: mail/mail-account-gui.c:1098
msgid "Select Folder"
msgstr "폴더 선택"
@@ -11871,19 +11907,19 @@ msgstr ""
"정규식 '%s'에서 오류가 발생했습니다:\n"
"%s"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
#: mail/mail-config.c:63 mail/mail-config.glade.h:68
msgid "Important"
msgstr "중요"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:66
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
#: mail/mail-config.glade.h:127
msgid "To Do"
msgstr "할 일"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:67
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
#: mail/mail-config.glade.h:72
msgid "Later"
msgstr "나중에"
@@ -12172,7 +12208,7 @@ msgstr "플래그 지정 아님"
#: filter/libfilter-i18n.h:36
msgid "Junk Test"
-msgstr "쓰레기 테스트"
+msgstr "정크메일 테스트"
#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:744
#: widgets/misc/e-expander.c:189
@@ -12193,11 +12229,11 @@ msgstr "메세지 머리말"
#: filter/libfilter-i18n.h:41
msgid "Message is Junk"
-msgstr "메세지가 쓰레기"
+msgstr "메세지가 정크메일"
#: filter/libfilter-i18n.h:42
msgid "Message is not Junk"
-msgstr "메세지가 쓰레기 아님"
+msgstr "메세지가 정크메일 아님"
#: filter/libfilter-i18n.h:43
msgid "Move to Folder"
@@ -12285,7 +12321,7 @@ msgstr "시작함"
msgid "Stop Processing"
msgstr "처리 중지"
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1562 mail/em-format.c:712
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
msgid "Subject"
@@ -12296,7 +12332,7 @@ msgid "Unset Status"
msgstr "상태 설정 없애기"
#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:979
+#: mail/mail-vfolder.c:978
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr "규칙 이름 '%s'이(가) 고유한 이름이 아닙니다. 다른 이름을 선택하십시오."
@@ -12414,7 +12450,7 @@ msgstr "Evolution 메일 폴더 보기"
msgid "Evolution Mail preferences control"
msgstr "Evolution 메일 기본 설정 컨트롤"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:805
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:811
#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
#: mail/importers/pine-importer.c:572
msgid "Mail"
@@ -12450,7 +12486,7 @@ msgid "Protocol"
msgstr "프로토콜"
#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1251
+#: mail/mail-config.c:1252
msgid "Unnamed"
msgstr "이름없음"
@@ -12474,7 +12510,7 @@ msgstr "스크립트 서명 더하기"
msgid "Signature(s)"
msgstr "서명"
-#: mail/em-composer-utils.c:123
+#: mail/em-composer-utils.c:124
#, c-format
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
@@ -12485,7 +12521,7 @@ msgstr ""
"받고 싶어하고, 받을 수 있는 지 확인하십시오.\n"
"%s어쨌든 메세지를 보내시겠습니까?"
-#: mail/em-composer-utils.c:137
+#: mail/em-composer-utils.c:138
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -12518,7 +12554,7 @@ msgstr ""
msgid "You must specify recipients in order to send this message."
msgstr "이 메세지를 보내려면 받는이를 지정해야 합니다."
-#: mail/em-composer-utils.c:579
+#: mail/em-composer-utils.c:578
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -12539,152 +12575,152 @@ msgstr "<폴더를 고를려면 여기를 누르십시오>"
msgid "Create New Folder"
msgstr "새 폴더 만들기"
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1305
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1298
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "폴더 만들 곳을 지정하세요:"
-#: mail/em-folder-selector.c:263
+#: mail/em-folder-selector.c:271
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr "폴더 이름(_N):"
#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:212
+#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/mail-component.c:164
msgid "On this Computer"
-msgstr "이 컴퓨터에"
+msgstr "이 컴퓨터"
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:827
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/mail-vfolder.c:826
msgid "VFolders"
msgstr "가상 폴더"
# VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
-#: mail/em-folder-tree-model.c:209 mail/em-folder-tree-model.c:211
+#: mail/em-folder-tree-model.c:215 mail/em-folder-tree-model.c:217
msgid "UNMATCHED"
msgstr "해당 없음"
#. Inbox is always first
-#: mail/em-folder-tree-model.c:237 mail/em-folder-tree-model.c:239
+#: mail/em-folder-tree-model.c:243 mail/em-folder-tree-model.c:245
#: shell/e-shortcuts.c:1085
msgid "Inbox"
msgstr "받은 편지함"
-#: mail/em-folder-tree-model.c:423 mail/em-folder-tree-model.c:713
+#: mail/em-folder-tree-model.c:488 mail/em-folder-tree-model.c:771
msgid "Loading..."
msgstr "읽어들이는 중..."
-#: mail/em-folder-tree-model.c:1276 mail/em-utils.c:2085
+#: mail/em-folder-tree-model.c:1339 mail/em-utils.c:2087
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
-#: mail/em-folder-tree-model.c:1285
+#: mail/em-folder-tree-model.c:1348
#, c-format
msgid "Could not create temporary mbox store: %s"
msgstr "임시 메일함 저장고를 만들 수가 없습니다: %s"
-#: mail/em-folder-tree-model.c:1294
+#: mail/em-folder-tree-model.c:1357
#, c-format
msgid "Could not create temporary mbox folder: %s"
msgstr "임시 메일함 폴더를 만들 수가 없습니다: %s"
-#: mail/em-folder-tree-model.c:1309
+#: mail/em-folder-tree-model.c:1372
#, c-format
msgid "Could not copy messages to temporary mbox folder: %s"
msgstr "메세지를 임시 메일함 폴더에 복사할 수 없습니다: %s"
-#: mail/em-folder-tree.c:1183 mail/em-folder-tree.c:1270
+#: mail/em-folder-tree.c:1176 mail/em-folder-tree.c:1263
#, c-format
msgid "%s"
msgstr "%s"
-#: mail/em-folder-tree.c:1199 mail/em-folder-tree.c:1212
+#: mail/em-folder-tree.c:1192 mail/em-folder-tree.c:1205
#: mail/em-folder-view.c:621 mail/em-folder-view.c:635
#: shell/e-shell-importer.c:1060
msgid "Select folder"
msgstr "폴더 선택"
-#: mail/em-folder-tree.c:1305
+#: mail/em-folder-tree.c:1298
msgid "Create folder"
msgstr "폴더를 만듭니다"
-#: mail/em-folder-tree.c:1423
+#: mail/em-folder-tree.c:1417
#, c-format
msgid "Could not delete folder: %s"
msgstr "폴더를 지울 수 없습니다: %s"
-#: mail/em-folder-tree.c:1444
+#: mail/em-folder-tree.c:1438
#, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "정말로 \"%s\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
-#: mail/em-folder-tree.c:1454 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1448 shell/e-shell-folder-commands.c:416
#, c-format
msgid "Delete \"%s\""
msgstr "\"%s\" 지우기"
-#: mail/em-folder-tree.c:1488 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1482 shell/e-shell-folder-commands.c:534
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "\"%s\" 폴더 이름 바꾸기:"
-#: mail/em-folder-tree.c:1490 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1484 shell/e-shell-folder-commands.c:541
msgid "Rename Folder"
msgstr "폴더 이름 바꾸기"
-#: mail/em-folder-tree.c:1514 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1508 shell/e-shell-folder-commands.c:554
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr "\"%s\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
-#: mail/em-folder-tree.c:1614
+#: mail/em-folder-tree.c:1608
msgid "Folder properties"
msgstr "글꼴 등록 정보"
#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1620
+#: mail/em-folder-tree.c:1614
msgid "Properties"
msgstr "등록 정보"
#. TODO: can this be done in a loop?
-#: mail/em-folder-tree.c:1629
+#: mail/em-folder-tree.c:1623
msgid "Folder Name"
msgstr "폴더 이름"
-#: mail/em-folder-tree.c:1640
+#: mail/em-folder-tree.c:1634
msgid "Total messages"
msgstr "전체 메세지"
-#: mail/em-folder-tree.c:1652
+#: mail/em-folder-tree.c:1646
msgid "Unread messages"
msgstr "읽지 않은 메세지"
-#: mail/em-folder-tree.c:1761 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:1755 ui/evolution-addressbook.xml.h:45
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:34
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "보기(_V)"
-#: mail/em-folder-tree.c:1762
+#: mail/em-folder-tree.c:1756
msgid "Open in _New Window"
msgstr "새 창에서 열기(_N)"
-#: mail/em-folder-tree.c:1767
+#: mail/em-folder-tree.c:1761
msgid "_Move"
msgstr "이동(_N)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:1771
+#: mail/em-folder-tree.c:1765
msgid "_New Folder..."
msgstr "새 폴더(_N)..."
-#: mail/em-folder-tree.c:1774 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1768 shell/e-shortcuts-view.c:427
msgid "_Rename"
msgstr "이름 바꾸기(_R)"
-#: mail/em-folder-tree.c:1777 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1771 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "등록 정보(_P)..."
@@ -12747,11 +12783,11 @@ msgstr "중요하지 않은 것으로 표시(_M)"
#: mail/em-folder-view.c:732 ui/evolution-mail-message.xml.h:52
msgid "Mark as _Junk"
-msgstr "쓰레기로 표시(_J)"
+msgstr "정크메일로 표시(_J)"
#: mail/em-folder-view.c:733 ui/evolution-mail-message.xml.h:53
msgid "Mark as _Not Junk"
-msgstr "쓰레기가 아닌 것으로 표시(_N)"
+msgstr "정크메일이 아닌 것으로 표시(_N)"
#: mail/em-folder-view.c:737
msgid "U_ndelete"
@@ -12831,16 +12867,16 @@ msgid "Click to mail %s"
msgstr "메일을 %s(으)로 보내려면 누르십시오"
#. message-search popup match count string
-#: mail/em-format-html-display.c:400
+#: mail/em-format-html-display.c:404
#, c-format
msgid "Matches: %d"
msgstr "일치: %d"
-#: mail/em-format-html-display.c:636 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:562
msgid "Unsigned"
msgstr "서명 없음"
-#: mail/em-format-html-display.c:636
+#: mail/em-format-html-display.c:640
msgid ""
"This message is not signed. There is no guarantee the sender of the message "
"is authentic."
@@ -12848,11 +12884,11 @@ msgstr ""
"이 메세지에는 디지탈 사인이 없습니다. 메세지를 보낸이가 확실한 지 보장할 수 "
"없습니다."
-#: mail/em-format-html-display.c:637 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:563
msgid "Valid signature"
msgstr "올바른 서명"
-#: mail/em-format-html-display.c:637
+#: mail/em-format-html-display.c:641
msgid ""
"This message is signed and is valid, the sender of this message is very "
"likely who they claim to be."
@@ -12860,11 +12896,11 @@ msgstr ""
"이 메세지는 디지탈 사인되었고 사인이 올바릅니다. 메세지를 보낸이가 그 사람"
"이 거의 확실합니다."
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:564
msgid "Invalid signature"
msgstr "잘못된 서명"
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:642
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -12872,11 +12908,11 @@ msgstr ""
"이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
"다."
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:565
msgid "Valid signature, cannot verify sender"
msgstr "올바른 서명, 보낸이를 확인할 수 없음"
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:643
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -12884,11 +12920,11 @@ msgstr ""
"이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
"할 수 없습니다."
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:571
msgid "Unencrypted"
msgstr "암호화 안 됨"
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:649
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
@@ -12896,11 +12932,11 @@ msgstr ""
"메세지를 암호화하지 않았습니다. 이 메세지가 인터넷을 통해 전달되는 동안, 다"
"른 사람이 메세지 내용을 볼 수도 있습니다."
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:572
msgid "Encrypted, weak"
msgstr "암호화됨, 약함"
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:650
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
@@ -12910,11 +12946,11 @@ msgstr ""
"사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
"능하지는 않습니다."
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:573
msgid "Encrypted"
msgstr "암호화됨"
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:651
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -12922,11 +12958,11 @@ msgstr ""
"메세지가 암호화되어 있습니다. 다른 사람이 이 메세지의 내용을 알아 내기는 어"
"렵습니다."
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:574
msgid "Encrypted, strong"
msgstr "암호화됨, 강력"
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:652
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -12935,45 +12971,32 @@ msgstr ""
"메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다. 현실"
"적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
-#: mail/em-format-html-display.c:732
+#: mail/em-format-html-display.c:736
msgid "_View Certificate"
msgstr "인증서 보기(_V)"
-#: mail/em-format-html-display.c:737
+#: mail/em-format-html-display.c:741
msgid "This certificate is not viewable"
msgstr "이 인증서는 볼 수 없습니다"
-#: mail/em-format-html-display.c:905 mail/em-format-html.c:650
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-format-html-display.c:941 mail/em-format-html.c:1075
-#: mail/em-format.c:1270
-msgid "Unsupported signature format"
-msgstr "지원하지 않는 서명 형식입니다"
-
-#: mail/em-format-html-display.c:949 mail/em-format-html.c:1083
-msgid "Unknown error verifying signature"
-msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-format-html-display.c:1064
+#: mail/em-format-html-display.c:976
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "마침: %Y년 %B %d일, %p %l:%M"
-#: mail/em-format-html-display.c:1072
+#: mail/em-format-html-display.c:984
msgid "Overdue:"
msgstr "마감 지남:"
-#: mail/em-format-html-display.c:1075
+#: mail/em-format-html-display.c:987
msgid "by %B %d, %Y, %l:%M %p"
msgstr "%b %d일, %p %l:%M까지"
# FIXME - inline의 나은 번역을 찾아보자
-#: mail/em-format-html-display.c:1145
+#: mail/em-format-html-display.c:1057
msgid "_View Inline"
msgstr "인라인으로 보기"
-#: mail/em-format-html-display.c:1146
+#: mail/em-format-html-display.c:1058
msgid "_Hide"
msgstr "숨기기(_H)"
@@ -12982,111 +13005,115 @@ msgstr "숨기기(_H)"
msgid "Page %d of %d"
msgstr "%2$d페이지 중 %1$d페이지"
-#: mail/em-format-html.c:456 mail/em-format-html.c:458
+#: mail/em-format-html.c:455 mail/em-format-html.c:457
#, c-format
msgid "Retrieving `%s'"
msgstr "`%s' 가져오는 중"
-#: mail/em-format-html.c:844
+#: mail/em-format-html.c:812
msgid "Malformed external-body part."
msgstr "외부 본문 부분의 형식이 잘못되었습니다."
-#: mail/em-format-html.c:874
+#: mail/em-format-html.c:842
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "FTP 사이트(%s)를 가리킵니다"
-#: mail/em-format-html.c:885
+#: mail/em-format-html.c:853
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:855
#, c-format
msgid "Pointer to local file (%s)"
msgstr "로컬 파일(%s)을 가리킵니다"
-#: mail/em-format-html.c:908
+#: mail/em-format-html.c:876
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "원격 데이터(%s)을 가리킵니다"
-#: mail/em-format-html.c:919
+#: mail/em-format-html.c:887
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
-#: mail/em-format-html.c:1061
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
-
-#: mail/em-format-html.c:1177
+#: mail/em-format-html.c:1098
msgid "Formatting message"
msgstr "메세지를 포맷하는 중입니다"
-#: mail/em-format-html.c:1453 mail/em-format.c:707 mail/em-mailer-prefs.c:67
+#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
msgid "From"
msgstr "보낸이"
-#: mail/em-format-html.c:1453 mail/em-format.c:708 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr "회신 주소"
-#: mail/em-format-html.c:1453 mail/em-format.c:709 mail/em-mailer-prefs.c:69
+#: mail/em-format-html.c:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
#: mail/message-list.etspec.h:14
msgid "To"
msgstr "받는이"
-#: mail/em-format-html.c:1453 mail/em-format.c:710 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr "참조"
-#: mail/em-format-html.c:1453 mail/em-format.c:711 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr "숨은 참조"
-#: mail/em-format-html.c:1569 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
msgid "Mailer"
msgstr "메일 프로그램"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1595
+#: mail/em-format-html.c:1517
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%a %R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1598
+#: mail/em-format-html.c:1520
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: mail/em-format-html.c:1610 mail/em-format.c:713 mail/em-mailer-prefs.c:73
+#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
#: mail/message-list.etspec.h:2
msgid "Date"
msgstr "날짜"
-#: mail/em-format.c:929
+#: mail/em-format.c:964
#, c-format
msgid "%s attachment"
msgstr "%s 첨부"
-#: mail/em-format.c:1258
-msgid "Session not initialised"
-msgstr "세션이 초기화되지 않았습니다"
+#: mail/em-format.c:1043 mail/em-format.c:1162
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+
+#: mail/em-format.c:1152
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
-#: mail/em-format.c:1284
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "이 메세지는 디지탈 서명되어 있고 인증되었습니다."
+#: mail/em-format.c:1296
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
-#: mail/em-format.c:1286
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "이 메세지는 디지탈 서명되어 있지만 인증되었는지 알아볼 수 없습니다."
+#: mail/em-format.c:1313
+msgid "Unsupported signature format"
+msgstr "지원하지 않는 서명 형식입니다"
+
+#: mail/em-format.c:1321
+msgid "Unknown error verifying signature"
+msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
#: mail/em-junk-filter.c:72
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (내부에 포함)"
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1079
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13097,23 +13124,23 @@ msgstr ""
"\n"
"폴더를 옮기는 동안 잠시 기다리십시오..."
-#: mail/em-migrate.c:1770 mail/em-migrate.c:1785
+#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
#, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr "POP3 UID 캐시를 옮기는 데 실패했습니다: %s"
# folder expand state?
-#: mail/em-migrate.c:1873 mail/em-migrate.c:1974
+#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
#, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr "폴더 상태를 옮기는 데 실패했습니다: %s"
-#: mail/em-migrate.c:2098 mail/em-migrate.c:2267
+#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
#, c-format
msgid "Failed to create directory `%s': %s"
msgstr "`%s' 디렉토리를 만들 수 없습니다: %s"
-#: mail/em-migrate.c:2110
+#: mail/em-migrate.c:2140
#, c-format
msgid "Failed to open store for `%s': %s"
msgstr "`%s'에 쓸 저장고를 여는 데 실패했습니다: %s"
@@ -13152,33 +13179,33 @@ msgstr "주소록에 더하기(_A)"
msgid "Open in %s..."
msgstr "%s에서 열기..."
-#: mail/em-subscribe-editor.c:605
+#: mail/em-subscribe-editor.c:606
msgid "This store does not support subscriptions, or they are not enabled."
msgstr ""
"이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
-#: mail/em-subscribe-editor.c:634
+#: mail/em-subscribe-editor.c:635
msgid "Subscribed"
msgstr "구독"
-#: mail/em-subscribe-editor.c:638 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "폴더"
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:826
+#: mail/em-subscribe-editor.c:827
msgid "Please select a server."
msgstr "서버를 선택하십시오."
-#: mail/em-subscribe-editor.c:847
+#: mail/em-subscribe-editor.c:848
msgid "No server has been selected"
msgstr "서버를 선택하지 않았습니다"
-#: mail/em-utils.c:95
+#: mail/em-utils.c:97
msgid "Don't show this message again."
msgstr "이 메세지를 다시 보지 않습니다."
-#: mail/em-utils.c:277
+#: mail/em-utils.c:279
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -13187,25 +13214,25 @@ msgstr ""
"거르게 정보를 읽어들이는 데 오류가 발생했습니다:\n"
"%s"
-#: mail/em-utils.c:286
+#: mail/em-utils.c:288
msgid "Filters"
msgstr "거르개"
-#: mail/em-utils.c:531
+#: mail/em-utils.c:533
msgid "-------- Forwarded Message --------"
msgstr "-------- 전달된 메시지 --------"
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1138
msgid "an unknown sender"
msgstr "알 수 없는 보낸 이"
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1146
+#: mail/em-utils.c:1148
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "%Y-%m-%d %a %H:%M %%+05d에 %%s 쓰기를:"
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1425 mail/em-utils.c:1509 mail/em-utils.c:1518
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -13214,7 +13241,7 @@ msgstr ""
"`%s'에 저장할 수 없습니다\n"
" %s"
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1430
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -13223,20 +13250,20 @@ msgstr ""
"`%s'이(가) 이미 있습니다.\n"
"덮어쓰시겠습니까?"
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1473
msgid "message"
msgstr "메세지"
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1525
#, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr "오류: `%s'이(가) 있으나 일반 파일이 아닙니다."
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1579
msgid "Save Message..."
msgstr "메세지 저장..."
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1617
msgid "Add address"
msgstr "주소 더하기"
@@ -13893,56 +13920,56 @@ msgstr "필요한 정보중에 입력하지 않은 정보가 있습니다."
msgid "Evolution Account Editor"
msgstr "Evolution 계정 편집기"
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
msgid "_Host:"
msgstr "호스트(_H):"
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
msgid "User_name:"
msgstr "사용자이름(_N):"
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
msgid "_Path:"
msgstr "경로(_P):"
-#: mail/mail-account-gui.c:1970
+#: mail/mail-account-gui.c:1969
msgid "You may not create two accounts with the same name."
msgstr "같은 이름으로 두 개의 계정을 만들 수 없습니다."
-#: mail/mail-autofilter.c:74
+#: mail/mail-autofilter.c:75
#, c-format
msgid "Mail to %s"
msgstr "%s에 보내는 메일"
-#: mail/mail-autofilter.c:260
+#: mail/mail-autofilter.c:261
#, c-format
msgid "Subject is %s"
msgstr "제목이 %s"
-#: mail/mail-autofilter.c:276
+#: mail/mail-autofilter.c:277
#, c-format
msgid "Mail from %s"
msgstr "%s에서 온 메일"
-#: mail/mail-autofilter.c:293
+#: mail/mail-autofilter.c:294
#, c-format
msgid "%s mailing list"
msgstr "%s 메일링 리스트"
-#: mail/mail-autofilter.c:317
+#: mail/mail-autofilter.c:318
#, c-format
msgid "Replies to %s"
msgstr "%s에 회신"
-#: mail/mail-autofilter.c:372
+#: mail/mail-autofilter.c:373
msgid "Add Filter Rule"
msgstr "거르게 규칙을 더하기"
-#: mail/mail-autofilter.c:421
+#: mail/mail-autofilter.c:422
msgid "The following filter rule(s):\n"
msgstr "다음 거르개 규칙:\n"
-#: mail/mail-autofilter.c:427
+#: mail/mail-autofilter.c:428
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -13953,19 +13980,19 @@ msgstr ""
" '%s'\n"
"가 새로 고쳐졌습니다."
-#: mail/mail-component.c:436
+#: mail/mail-component.c:449
msgid "New Mail Message"
msgstr "새 메일 메세지"
-#: mail/mail-component.c:437
+#: mail/mail-component.c:450
msgid "_Mail Message"
msgstr "메일 만들기(_M)"
-#: mail/mail-component.c:438
+#: mail/mail-component.c:451
msgid "Compose a new mail message"
msgstr "메일 메세지를 새로 작성합니다"
-#: mail/mail-component.c:577
+#: mail/mail-component.c:582
msgid "URI of the mail source that the view will display"
msgstr "뷰가 표시할 메일 소스의 URI"
@@ -14027,11 +14054,11 @@ msgstr ""
"니다. 이 계정의 이름을 아래의 빈 칸에 입력하십시오. 이 이름은 표시할 목적으로"
"만 사용됩니다."
-#: mail/mail-config.c:1091
+#: mail/mail-config.c:1092
msgid "Checking Service"
msgstr "서비스 확인중"
-#: mail/mail-config.c:1169 mail/mail-config.c:1173
+#: mail/mail-config.c:1170 mail/mail-config.c:1174
msgid "Connecting to server..."
msgstr "서버에 연결중..."
@@ -14133,7 +14160,7 @@ msgstr "새 메일 검사"
#: mail/mail-config.glade.h:31
msgid "Checks incoming mail messages to be Junk"
-msgstr "받는 메일이 쓰레기 메일인 지 검사합니다"
+msgstr "받는 메일이 정크메일인 지 검사합니다"
#: mail/mail-config.glade.h:32
msgid "Color for _misspelled words:"
@@ -14552,7 +14579,7 @@ msgstr "신원(_I)"
#: mail/mail-config.glade.h:159
msgid "_Junk"
-msgstr "쓰레기(_J)"
+msgstr "정크(_J)"
#: mail/mail-config.glade.h:160
msgid "_Load images if sender is in address book"
@@ -14570,7 +14597,7 @@ msgstr "내 기본 계정으로 하기(_M)"
# "Mark messages as read after <seconds> seconds"
#: mail/mail-config.glade.h:163
msgid "_Mark messages as read after"
-msgstr "메시지 읽은 후 다음만큼 지나면 읽은 것으로 표시(_M):"
+msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
#: mail/mail-config.glade.h:164
msgid "_Name:"
@@ -14644,7 +14671,7 @@ msgstr "다른 프로그램과 같은 글꼴 쓰기(_U)"
msgid "description"
msgstr "설명"
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
#, c-format
msgid "Pinging %s"
msgstr "\"%s\" 연결을 확인하는 중입니다"
@@ -14679,12 +14706,12 @@ msgstr "폴더 거르는 중"
msgid "Fetching Mail"
msgstr "메일 가져오는 중"
-#: mail/mail-ops.c:537
+#: mail/mail-ops.c:536
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "나가는 거르개를 적용하는 데 실패했습니다: %s"
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:561
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14693,106 +14720,106 @@ msgstr ""
"%s에 추가하는 데 실패했습니다: %s\n"
"대신에 로컬의 `보낸 편지함'에 추가합니다."
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:570
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "로컬의 '보낸 편지함' 폴더에 추가하는 데 실패했습니다: %s"
-#: mail/mail-ops.c:609
+#: mail/mail-ops.c:612
#, c-format
msgid "Sending \"%s\""
msgstr "\"%s\" 보내는 중"
-#: mail/mail-ops.c:727
+#: mail/mail-ops.c:731
#, c-format
msgid "Sending message %d of %d"
msgstr "%2$d개 중 %1$d개 메세지 보냄"
-#: mail/mail-ops.c:746
+#: mail/mail-ops.c:750
#, c-format
msgid "Failed on message %d of %d"
msgstr "%2$d개 중 %1$d 메시지 실패"
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:752
msgid "Complete."
msgstr "완료."
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:846
msgid "Saving message to folder"
msgstr "메세지를 폴더로 저장하는 중"
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:931
#, c-format
msgid "Moving messages to %s"
msgstr "메시지들을 %s(으)로 옮기는 중"
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:931
#, c-format
msgid "Copying messages to %s"
msgstr "메시지들을 %s(으)로 복사하는 중"
-#: mail/mail-ops.c:1040
+#: mail/mail-ops.c:1044
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "\"%s\"의 폴더를 찾는 중"
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
msgid "Forwarded messages"
msgstr "전달된 메시지"
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
#, c-format
msgid "Opening folder %s"
msgstr "%s 폴더를 열기"
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
#, c-format
msgid "Opening store %s"
msgstr "저장고 %s을(를) 여는 중입니다"
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1433
#, c-format
msgid "Removing folder %s"
msgstr "%s 폴더를 지우는 중입니다"
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1527
#, c-format
msgid "Storing folder '%s'"
msgstr "%s 폴더를 저장하는 중입니다"
-#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1578
msgid "Refreshing folder"
msgstr "폴더 다시 읽는 중입니다"
-#: mail/mail-ops.c:1610 mail/mail-ops.c:1661
+#: mail/mail-ops.c:1614 mail/mail-ops.c:1665
msgid "Expunging folder"
msgstr "지운 메세지를 비우는 중입니다"
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1662
#, c-format
msgid "Emptying trash in '%s'"
msgstr "'%s' 안의 휴지통을 비우는 중입니다"
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1663
msgid "Local Folders"
msgstr "로컬 폴더"
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1746
#, c-format
msgid "Retrieving message %s"
msgstr "메세지 %s을(를) 가져오기"
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1818
#, c-format
msgid "Retrieving %d message(s)"
msgstr "메세지 %d개 가져오는중"
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1902
#, c-format
msgid "Saving %d messsage(s)"
msgstr "메시지 %d개 저장중"
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1950
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -14801,7 +14828,7 @@ msgstr ""
"출력파일을 만들 수가 없습니다: %s\n"
" %s"
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1978
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14810,11 +14837,11 @@ msgstr ""
"%s(으)로 메시지 저장 중 오류 발생:\n"
" %s"
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2049
msgid "Saving attachment"
msgstr "첨부 저장"
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2066
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14823,22 +14850,22 @@ msgstr ""
"출력 파일을 만들 수 없음: %s:\n"
" %s"
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2096
#, c-format
msgid "Could not write data: %s"
msgstr "데이터를 쓸 수가 없습니다: %s"
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2244
#, c-format
msgid "Disconnecting from %s"
msgstr "%s에서 연결 끊는 중"
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2244
#, c-format
msgid "Reconnecting to %s"
msgstr "%s(으)로 다시 연결중"
-#: mail/mail-ops.c:2342
+#: mail/mail-ops.c:2346
msgid "Changing junk status"
msgstr "쓰레기 메일 상태를 바꾸는 중"
@@ -14870,38 +14897,38 @@ msgstr "암호화"
msgid "Security Information"
msgstr "보안 정보"
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
msgid "Cancelling..."
msgstr "취소 중..."
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:254
#, c-format
msgid "Server: %s, Type: %s"
msgstr "서버: %s, 형식: %s"
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:256
#, c-format
msgid "Path: %s, Type: %s"
msgstr "경로: %s, 형식: %s"
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:258
#, c-format
msgid "Type: %s"
msgstr "형식: %s"
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:311
msgid "Send & Receive Mail"
msgstr "메일 주고받기"
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:314
msgid "Cancel _All"
msgstr "모두 취소(_A)"
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:395
msgid "Updating..."
msgstr "업데이트 중..."
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
msgid "Waiting..."
msgstr "기다리는 중..."
@@ -14961,16 +14988,26 @@ msgstr "이 서명의 이름을 입력하십시오."
msgid "Name:"
msgstr "이름:"
-#: mail/mail-tools.c:271
+#: mail/mail-tools.c:114
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "스풀 디렉토리 `%s'을(를) 만들 수 없습니다: %s"
+
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "mbox가 아닌 소스 `%s'에서 메일 옮기기를 시도했습니다"
+
+#: mail/mail-tools.c:276
#, c-format
msgid "Forwarded message - %s"
msgstr "전달된 메시지 - %s"
-#: mail/mail-tools.c:273
+#: mail/mail-tools.c:278
msgid "Forwarded message"
msgstr "전달된 메시지"
-#: mail/mail-tools.c:313
+#: mail/mail-tools.c:318
#, c-format
msgid "Invalid folder: `%s'"
msgstr "잘못된 폴더: `%s'"
@@ -14985,7 +15022,7 @@ msgstr "가상 폴더 설정: %s"
msgid "Updating vfolders for uri: %s"
msgstr "가상폴더의 uri 새로 고침: %s"
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:497
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -14998,85 +15035,85 @@ msgstr ""
" '%s'\n"
"가 새로 고쳐졌습니다."
-#: mail/mail-vfolder.c:897
+#: mail/mail-vfolder.c:896
msgid "vFolders"
msgstr "가상 폴더"
-#: mail/mail-vfolder.c:936
+#: mail/mail-vfolder.c:935
msgid "Edit VFolder"
msgstr "가상폴더 편집"
-#: mail/mail-vfolder.c:956
+#: mail/mail-vfolder.c:955
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "없는 가상 폴더 '%s'을(를) 편집하려 합니다."
-#: mail/mail-vfolder.c:1028
+#: mail/mail-vfolder.c:1027
msgid "New VFolder"
msgstr "새 가상폴더"
-#: mail/message-list.c:907
+#: mail/message-list.c:927
msgid "Unseen"
msgstr "보지않았음"
-#: mail/message-list.c:908
+#: mail/message-list.c:928
msgid "Seen"
msgstr "봤음"
-#: mail/message-list.c:909
+#: mail/message-list.c:929
msgid "Answered"
msgstr "응답함"
-#: mail/message-list.c:910
+#: mail/message-list.c:930
msgid "Multiple Unseen Messages"
msgstr "여러개의 보지않은 메세지"
-#: mail/message-list.c:911
+#: mail/message-list.c:931
msgid "Multiple Messages"
msgstr "여러 메세지"
-#: mail/message-list.c:915
+#: mail/message-list.c:935
msgid "Lowest"
msgstr "가장 낮음"
-#: mail/message-list.c:916
+#: mail/message-list.c:936
msgid "Lower"
msgstr "낮음"
-#: mail/message-list.c:920
+#: mail/message-list.c:940
msgid "Higher"
msgstr "높음"
-#: mail/message-list.c:921
+#: mail/message-list.c:941
msgid "Highest"
msgstr "가장 높음"
# ???
-#: mail/message-list.c:1242
+#: mail/message-list.c:1262
msgid "?"
msgstr "?"
-#: mail/message-list.c:1249
+#: mail/message-list.c:1269
msgid "Today %l:%M %p"
msgstr "오늘 %p %l:%M"
-#: mail/message-list.c:1258
+#: mail/message-list.c:1278
msgid "Yesterday %l:%M %p"
msgstr "어제 %p %l:%M "
-#: mail/message-list.c:1270
+#: mail/message-list.c:1290
msgid "%a %l:%M %p"
msgstr "%a %p %l:%M"
-#: mail/message-list.c:1278
+#: mail/message-list.c:1298
msgid "%b %d %l:%M %p"
msgstr "%b %d일 %p %l:%M"
-#: mail/message-list.c:1280
+#: mail/message-list.c:1300
msgid "%b %d %Y"
msgstr "%Y년 %b %d일"
-#: mail/message-list.c:3100
+#: mail/message-list.c:3116
msgid "Generating message list"
msgstr "메세지 목록 작성중"
@@ -15678,51 +15715,61 @@ msgstr "새로운 바로가기를 만듭니다"
msgid "Select the folder you want the shortcut to point to:"
msgstr "바로가기가 가리킬 폴더를 선택하십시오:"
-#: shell/e-shell-view-menu.c:779 shell/e-shell-window-commands.c:323
+#: shell/e-shell-view-menu.c:779 shell/e-shell-window-commands.c:353
msgid "_Work Online"
msgstr "온라인 작업(_W)"
-#: shell/e-shell-view-menu.c:792 shell/e-shell-window-commands.c:336
-#: ui/evolution.xml.h:36
+#: shell/e-shell-view-menu.c:792 shell/e-shell-window-commands.c:366
+#: ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr "오프라인 작업(_W)"
-#: shell/e-shell-view-menu.c:805 shell/e-shell-window-commands.c:349
+#: shell/e-shell-view-menu.c:805 shell/e-shell-window-commands.c:379
#: ui/evolution.xml.h:22
msgid "Work Offline"
msgstr "오프라인에서 작업"
-#: shell/e-shell-window.c:324
+#: shell/e-shell-window.c:327
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
"Ximian Evolution은 온라인 상태입니다. 오프라인 상태로 작업하려면 이 단추를 "
"누르십시오."
-#: shell/e-shell-window.c:331
+#: shell/e-shell-window.c:334
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
-#: shell/e-shell-window.c:337
+#: shell/e-shell-window.c:340
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
"Ximian Evolution은 오프라인 상태입니다. 온라인 상태로 작업하려면 이 단추를 "
"누르십시오."
-#: shell/e-shell.c:994
+#: shell/e-shell.c:529
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+"경고: 버전 %d.%d.%d에서 모든 데이터를 업그레이드하지 못했습니다.\n"
+"데이터는 지워지지 않았지만, 이 버전의 Evolution에서는 안 보일 것입니다.\n"
+
+#: shell/e-shell.c:1068
msgid "Invalid arguments"
msgstr "인자가 잘못되었습니다"
-#: shell/e-shell.c:996
+#: shell/e-shell.c:1070
msgid "Cannot register on OAF"
msgstr "OAF에 등록할 수 없습니다"
-#: shell/e-shell.c:998
+#: shell/e-shell.c:1072
msgid "Configuration Database not found"
msgstr "설정 데이터베이스를 찾을 수 없습니다"
-#: shell/e-shell.c:1000
+#: shell/e-shell.c:1074
msgid "Generic error"
msgstr "일반 오류"
@@ -16063,16 +16110,16 @@ msgstr "다시 물어보지 않습니다"
msgid "Evolution can import data from the following files:"
msgstr "다음 파일들을 Evolution으로 가져올 수 있습니다:"
-#: shell/main.c:115 shell/main.c:628
+#: shell/main.c:118 shell/main.c:582
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:121
+#: shell/main.c:124
msgid "Evolution is now exiting ..."
msgstr "Evolution을 마칩니다..."
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:271
+#: shell/main.c:275
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16106,7 +16153,7 @@ msgstr ""
"우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
"주시기를 목이 빠지게 기다리겠습니다!\n"
-#: shell/main.c:295
+#: shell/main.c:299
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -16114,50 +16161,44 @@ msgstr ""
"고맙습니다\n"
"Ximian Evolution 팀\n"
-#: shell/main.c:303
+#: shell/main.c:307
msgid "Don't tell me again"
msgstr "다시 물어보지 않습니다"
-#: shell/main.c:407
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"경고: 버전 %d.%d.%d에서 모든 데이터를 업그레이드하지 못했습니다.\n"
-"데이터는 지워지지 않았지만, 이 버전의 Evolution에서는 안 보일 것입니다.\n"
-
-#: shell/main.c:486
+#: shell/main.c:439
msgid "Cannot access the Ximian Evolution shell."
msgstr "Ximian Evolution 쉘에 접근할 수 없습니다."
-#: shell/main.c:495
+#: shell/main.c:448
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Ximian Evolution 쉘을 초기화 할 수 없습니다: %s"
-#: shell/main.c:595
+#: shell/main.c:545
msgid "Start Evolution activating the specified component"
msgstr "Evolution 시작할 때 특정 컴포넌트를 활성화합니다"
-#: shell/main.c:597
+#: shell/main.c:547
msgid "Start in offline mode"
msgstr "오프라인 모드에서 시작"
-#: shell/main.c:599
+#: shell/main.c:549
msgid "Start in online mode"
msgstr "온라인 모드에서 시작"
-#: shell/main.c:602
+#: shell/main.c:552
msgid "Forcibly shut down all evolution components"
msgstr "강제로 모든 Evolution 컴포넌트를 끝냅니다"
-#: shell/main.c:605
+#: shell/main.c:556
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr "강제로 Evolution 1.4에서 다시 옮겨 옵니다"
+
+#: shell/main.c:559
msgid "Send the debugging output of all components to a file."
msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
-#: shell/main.c:632
+#: shell/main.c:586
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -17411,7 +17452,7 @@ msgstr "읽지 않은 다음 메세지(_U)"
#: ui/evolution-mail-message.xml.h:67
msgid "Not Junk"
-msgstr "쓰레기 아님"
+msgstr "정크 아님"
#: ui/evolution-mail-message.xml.h:68
msgid "Open the selected message in a new window"
@@ -17592,7 +17633,7 @@ msgstr "인용(_Q)"
msgid "_Resend..."
msgstr "다시 보냄(_R)..."
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:33
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
msgid "_Tools"
msgstr "도구(_T)"
@@ -17995,10 +18036,14 @@ msgid "_New"
msgstr "새로 만들기(_N)"
#: ui/evolution.xml.h:31
+msgid "_Quick Reference"
+msgstr "간단한 참조 문서(_Q)"
+
+#: ui/evolution.xml.h:32
msgid "_Send / Receive"
msgstr "보내고 받기(_S)"
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
msgid "_Window"
msgstr "창(_W)"
@@ -18287,24 +18332,24 @@ msgstr "표시 여백"
msgid "Spacing around expander arrow"
msgstr "확장 화살표 주위의 여백"
-#: widgets/misc/e-filter-bar.c:185
+#: widgets/misc/e-filter-bar.c:191
msgid "Search Editor"
msgstr "찾기 편집기"
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
+#: widgets/misc/e-filter-bar.c:212
msgid "Save Search"
msgstr "찾기 저장"
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
msgid "_Save Search..."
msgstr "찾기 저장(_S)..."
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
msgid "_Edit Saved Searches..."
msgstr "저장된 찾기 편집(_E)..."
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
msgid "_Advanced..."
msgstr "고급(_A)..."