aboutsummaryrefslogtreecommitdiffstats
path: root/po/ko.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-02 07:17:13 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-02 07:17:13 +0800
commit71bff5ef173daaf872a30d98fbdc0a7e4e667d33 (patch)
tree5589dc0ed5292ce7a28da38140dd9c8e219ad140 /po/ko.po
parentc634d2826e6f7726dc59fdd134ac17ac23f5dc6e (diff)
downloadgsoc2013-evolution-71bff5ef173daaf872a30d98fbdc0a7e4e667d33.tar.gz
gsoc2013-evolution-71bff5ef173daaf872a30d98fbdc0a7e4e667d33.tar.zst
gsoc2013-evolution-71bff5ef173daaf872a30d98fbdc0a7e4e667d33.zip
0.15.
svn path=/trunk/; revision=13289
Diffstat (limited to 'po/ko.po')
-rw-r--r--po/ko.po2091
1 files changed, 1142 insertions, 949 deletions
diff --git a/po/ko.po b/po/ko.po
index 531e753a62..b50b924b99 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
"PO-Revision-Date: 2001-03-23 02:12+0900\n"
"Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
"Language-Team: korean <ko@li.org>\n"
@@ -37,293 +37,293 @@ msgid "Name"
msgstr "À̸§"
#: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Á¤½Ä À̸§"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
#: addressbook/gui/widgets/e-addressbook-view.c:870
msgid "Email"
msgstr "À̸ÞÀÏ"
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
#: addressbook/gui/contact-editor/e-contact-editor.c:1609
msgid "Primary"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
#, fuzzy
msgid "Prim"
msgstr "Àμâ"
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
#: addressbook/gui/contact-editor/e-contact-editor.c:1594
#: addressbook/gui/widgets/e-addressbook-view.c:902
msgid "Assistant"
msgstr "Á¶¼ö"
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/gui/contact-editor/e-contact-editor.c:1595
#: addressbook/gui/contact-editor/e-contact-editor.c:1662
msgid "Business"
msgstr "Á÷Àå"
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
#, fuzzy
msgid "Bus"
msgstr "¹Ù»Ý"
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/gui/contact-editor/e-contact-editor.c:1598
msgid "Callback"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/gui/contact-editor/e-contact-editor.c:1600
msgid "Company"
msgstr "ȸ»ç"
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
#, fuzzy
msgid "Comp"
msgstr "º¹»ç"
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
#: addressbook/gui/contact-editor/e-contact-editor.c:1601
#: addressbook/gui/contact-editor/e-contact-editor.c:1663
msgid "Home"
msgstr "Áý"
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "Organization"
msgstr "Á¶Á÷"
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
#, fuzzy
msgid "Org"
msgstr ""
"\n"
"±â°ü: "
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/e-contact-editor.c:1605
msgid "Mobile"
msgstr "ÈÞ´ëÀüÈ­"
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/e-contact-editor.c:1599
msgid "Car"
msgstr "ÀÚµ¿Â÷"
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/e-contact-editor.c:1597
#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Business Fax"
msgstr "Á÷Àå Æѽº"
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
#, fuzzy
msgid "Bus Fax"
msgstr "Á÷Àå Æѽº"
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
#: addressbook/gui/contact-editor/e-contact-editor.c:1603
#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "Home Fax"
msgstr "Áý Æѽº"
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/e-contact-editor.c:1596
msgid "Business 2"
msgstr "Á÷Àå 2"
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
#, fuzzy
msgid "Bus 2"
msgstr "¹Ù»Ý"
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
#: addressbook/gui/contact-editor/e-contact-editor.c:1602
msgid "Home 2"
msgstr "Áý 2"
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
#: addressbook/gui/contact-editor/e-contact-editor.c:1604
#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "ISDN"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
#: addressbook/gui/contact-editor/e-contact-editor.c:1606
#: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
msgid "Other"
msgstr "±âŸ"
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
#: addressbook/gui/contact-editor/e-contact-editor.c:1607
#: addressbook/gui/widgets/e-addressbook-view.c:888
msgid "Other Fax"
msgstr "±âŸ Æѽº"
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/gui/contact-editor/e-contact-editor.c:1608
#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid "Pager"
msgstr "ȧȧ"
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
#: addressbook/gui/contact-editor/e-contact-editor.c:1610
#: addressbook/gui/widgets/e-addressbook-view.c:890
msgid "Radio"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
#: addressbook/gui/contact-editor/e-contact-editor.c:1611
#: addressbook/gui/widgets/e-addressbook-view.c:891
msgid "Telex"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
#: addressbook/gui/widgets/e-addressbook-view.c:892
msgid "TTY"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
#: addressbook/gui/component/e-address-popup.c:476
#: addressbook/gui/contact-editor/e-contact-editor.c:1637
#: addressbook/gui/widgets/e-addressbook-view.c:894
msgid "Email 2"
msgstr "À̸ÞÀÏ 2"
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
#: addressbook/gui/component/e-address-popup.c:486
#: addressbook/gui/contact-editor/e-contact-editor.c:1638
#: addressbook/gui/widgets/e-addressbook-view.c:895
msgid "Email 3"
msgstr "À̸ÞÀÏ 3"
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/widgets/e-addressbook-view.c:896
msgid "Web Site"
msgstr "À¥ »çÀÌÆ®"
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
msgid "Url"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/widgets/e-addressbook-view.c:897
msgid "Department"
msgstr "ºÎ¼­"
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
msgid "Dep"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
#: addressbook/gui/widgets/e-addressbook-view.c:898
msgid "Office"
msgstr "»ç¹«½Ç"
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
#, fuzzy
msgid "Off"
msgstr "»ç¹«½Ç"
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
#: addressbook/gui/widgets/e-addressbook-view.c:899
msgid "Title"
msgstr "Á¦¸ñ"
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
#: addressbook/gui/widgets/e-addressbook-view.c:900
msgid "Profession"
msgstr "Á÷¾÷"
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
msgid "Prof"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
#: addressbook/gui/widgets/e-addressbook-view.c:901
msgid "Manager"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
#, fuzzy
msgid "Man"
msgstr "¿À¿ù"
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
msgid "Ass"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
#: addressbook/gui/widgets/e-addressbook-view.c:903
msgid "Nickname"
msgstr "º°¸í"
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
#, fuzzy
msgid "Nick"
msgstr "º°¸í"
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
#: addressbook/gui/widgets/e-addressbook-view.c:904
msgid "Spouse"
msgstr "¹è¿ìÀÚ"
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
#: addressbook/gui/widgets/e-addressbook-view.c:905
msgid "Note"
msgstr "³ëÆ®"
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
#, fuzzy
msgid "Calendar URI"
msgstr "´Þ·Â"
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
msgid "CALUri"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
#: addressbook/gui/widgets/e-addressbook-view.c:906
msgid "Free-busy URL"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
msgid "FBUrl"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
#, fuzzy
msgid "Anniversary"
msgstr "±â³äÀÏ(_v):"
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
msgid "Anniv"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
#, fuzzy
msgid "Birth Date"
msgstr ""
"\n"
"»ýÀÏ: "
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Categories"
msgstr "¸ñ·Ï"
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Á¤½Ä À̸§"
+
#: addressbook/backend/ebook/e-card.c:3564
msgid "Card: "
msgstr "Ä«µå: "
@@ -593,10 +593,10 @@ msgstr ""
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1119
+#: addressbook/conduit/address-conduit.c:1167
#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
@@ -662,20 +662,20 @@ msgstr ""
msgid "EBook not loaded\n"
msgstr ""
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
msgid "Could not start wombat server"
msgstr "wombat ¼­¹ö¸¦ ½ÃÀÛÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
msgid "Could not start wombat"
msgstr "wombatÀ» ½ÃÀÛÇÒ¼ö ¾ø½À´Ï´Ù"
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
msgid "Could not read pilot's Address application block"
msgstr ""
@@ -721,8 +721,8 @@ msgid "Factory for the sample Addressbook control"
msgstr "ÁÖ¼Ò·Ï"
#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
#: shell/e-shortcuts.c:1062
#, fuzzy
msgid "Contacts"
@@ -741,23 +741,23 @@ msgstr "LDAP ¼­¹ö"
msgid "LDAP server containing contact information"
msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
#: ui/evolution-addressbook.xml.h:11
#, fuzzy
msgid "New Contact"
msgstr "»õ ¿¬¶ôó"
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
#, fuzzy
msgid "New _Contact"
msgstr "»õ ¿¬¶ôó"
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
#, fuzzy
msgid "New Contact List"
msgstr "»õ ¿¬¶ôó"
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
#, fuzzy
msgid "New Contact _List"
msgstr "»õ ¿¬¶ôó"
@@ -865,19 +865,19 @@ msgid "_Account name:"
msgstr "°èÁ¤ °ü¸®"
#: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
msgid "_Add"
msgstr "Ãß°¡(_A)"
#: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
#: ui/evolution-tasks.xml.h:16
msgid "_Edit"
msgstr "¼öÁ¤(_E)"
@@ -901,36 +901,36 @@ msgstr "¼­¹ö Á¾·ù::"
msgid "Other Contacts"
msgstr "´Ù¸¥ ¿¬¶ôó"
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
#, c-format
msgid "Please enter your email address and password for access to %s"
msgstr ""
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
#, fuzzy
msgid "LDAP Authentication"
msgstr "ÀÎÁõ:"
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
msgid "Email Address:"
msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
msgid "Password:"
msgstr "ºñ¹Ð¹øÈ£:"
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
msgid "Unable to open addressbook"
msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is down"
msgstr ""
-#: addressbook/gui/component/addressbook.c:500
+#: addressbook/gui/component/addressbook.c:514
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -938,45 +938,45 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:649
+#: addressbook/gui/component/addressbook.c:663
#: calendar/gui/cal-search-bar.c:55
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
msgid "Name contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
msgid "Email contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
#: calendar/gui/cal-search-bar.c:59
#, fuzzy
msgid "Category is"
msgstr "¸ñ·Ï"
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
#: widgets/misc/e-filter-bar.h:104
msgid "Advanced..."
msgstr "°í±Þ..."
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
#: calendar/gui/cal-search-bar.c:412
#, fuzzy
msgid "Any Category"
msgstr "¸ñ·Ï:"
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
msgid "The URI that the Folder Browser will display"
msgstr "Æú´õ Ž»ö±â°¡ Ç¥½ÃÇÒ URI"
@@ -991,7 +991,7 @@ msgid "(none)"
msgstr "(À̸§ ¾øÀ½)"
#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
#: addressbook/gui/contact-editor/e-contact-editor.c:1636
msgid "Primary Email"
msgstr "À̸ÞÀÏ"
@@ -1170,121 +1170,127 @@ msgid "Details"
msgstr "ÀÚ¼¼È÷"
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
#, fuzzy
msgid "File A_s:"
msgstr "ÆÄÀÏ·Î ÀúÀå:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
msgid "General"
msgstr "ÀÏ¹Ý Á¤º¸"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "New phone type"
msgstr "»õ ÀüÈ­ ÇüÅÂ"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "No_tes:"
msgstr "³ëÆ®(_t):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
#, fuzzy
msgid "Organi_zation:"
msgstr "Á¶Á÷:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "Phone Types"
msgstr "ÀüÈ­ ÇüÅÂ"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "Wants to receive _HTML mail"
msgstr "HTMLÇü½Ä ÆíÁö »ç¿ë(_H)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "_Address..."
msgstr "ÁÖ¼Ò(_A)..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "_Assistant's name:"
msgstr "Á¶¼ö À̸§(_A):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "_Birthday:"
msgstr "»ýÀÏ(_B):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "_Business"
msgstr "Á÷Àå(_B)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "»ç¿ëÀÚ Á¤º¸"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "_Contacts..."
msgstr "¿¬¶ôó(_C)..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
msgid "_Delete"
msgstr "»èÁ¦(_D)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Department:"
msgstr "ºÎ¼­(_D):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "»ç¿ëÀÚ Á¤º¸"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Full Name..."
msgstr "Àüü À̸§(_F)..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Home"
msgstr "Áý(_H)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_Job title:"
msgstr "Á÷ÇÔ(_J):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Manager's Name:"
msgstr "¸Å´ÏÀú À̸§(_M):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Mobile"
msgstr "ÈÞ´ëÀüÈ­(_M)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Nickname:"
msgstr "º°¸í(_N):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Office:"
msgstr "»ç¹«½Ç(_O):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Profession:"
msgstr "Á÷¾÷(_P):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "´Þ·Â"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Spouse:"
msgstr "¹è¿ìÀÚ(_S):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_This is the mailing address"
msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
#, fuzzy
msgid "_Web page address:"
msgstr "ȨÆäÀÌÁö ÁÖ¼Ò:"
@@ -2533,7 +2539,7 @@ msgstr " %d Ãʸ¶´Ù"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
#: addressbook/gui/widgets/e-addressbook-view.c:691
#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "VCard·Î ÀúÀå"
@@ -2591,8 +2597,8 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
msgid "Unknown error"
msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
@@ -2601,7 +2607,7 @@ msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
msgid "Repository offline"
msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
msgid "Permission denied"
msgstr "Çã°¡±Ç °ÅºÎ"
@@ -2620,10 +2626,10 @@ msgid "Protocol not supported"
msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
msgid "Cancelled"
msgstr "Ãë¼ÒµÊ"
@@ -2653,7 +2659,7 @@ msgid "Error removing list"
msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
#, fuzzy
msgid "Error removing card"
msgstr ""
@@ -2939,8 +2945,8 @@ msgstr "±Û²Ã..."
msgid "Print cards"
msgstr "´Þ·Â ÀμâÇϱâ"
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
#, fuzzy
msgid "Print card"
msgstr "´Þ·Â ÀμâÇϱâ"
@@ -2951,18 +2957,44 @@ msgstr "´Þ·Â ÀμâÇϱâ"
msgid "Print envelope"
msgstr "ºÀÅõ Àμâ(_v)..."
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "³ôÀÌ"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "º¸Åë"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "³·°Ô"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Á¤ÀǾȵÊ"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
msgid "Error while communicating with calendar server"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
msgid "Could not read pilot's Calendar application block"
msgstr ""
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
msgid "Could not read pilot's ToDo application block"
msgstr ""
@@ -3010,47 +3042,47 @@ msgstr "¾Ë¶÷ ±â´É"
msgid "Factory for the alarm notification service"
msgstr "¾Ë¶÷ ±â´ÉÀ» À§ÇÑ ÆÑÅ丮"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
#, fuzzy, c-format
msgid "Notification about your appointment starting on %s and ending on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
#, fuzzy, c-format
msgid "Notification about your appointment starting on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
#, fuzzy, c-format
msgid "Notification about your appointment ending on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
#, fuzzy
msgid "Notification about your appointment"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
#, fuzzy, c-format
msgid "Notification about your task starting on %s and ending on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
#, fuzzy, c-format
msgid "Notification about your task starting on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
#, fuzzy, c-format
msgid "Notification about your task ending on %s"
msgstr "%A %b %d %Y %H:%M¿¡ ¾à¼Ó ½Ã°£ ¾Ë¸²"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
#, fuzzy
msgid "Notification about your task"
msgstr "EvolutionÀÇ Á¤º¸ º¸±â"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
msgid "Alarm on %A %b %d %Y %H:%M"
msgstr "%A %b %d %Y %H:%M¿¡ ¾Ë¶÷"
@@ -3135,7 +3167,7 @@ msgstr "%Y/%m/%d"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
msgid "%d %B"
msgstr ""
@@ -3144,17 +3176,17 @@ msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
msgid "Private"
msgstr ""
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
msgid "Public"
msgstr ""
@@ -3174,68 +3206,49 @@ msgstr "µ¿"
msgid "W"
msgstr "¼­"
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "³ôÀÌ"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "º¸Åë"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "³·°Ô"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
#, fuzzy
msgid "Free"
msgstr "ÁÖ"
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
#: calendar/gui/e-meeting-time-sel.c:393
msgid "Busy"
msgstr "¹Ù»Ý"
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
msgid "Not Started"
msgstr "½ÃÀÛ ¾ÈÇÔ"
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
msgid "In Progress"
msgstr "ÁøÇàÁß"
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
#: calendar/gui/e-meeting-model.c:321
msgid "Completed"
msgstr "¿Ï·áµÊ"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
#: e-util/e-time-utils.c:354
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr ""
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
#: e-util/e-time-utils.c:363
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr ""
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -3243,54 +3256,43 @@ msgid ""
"%s"
msgstr ""
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
"45.436845,125.862501"
msgstr ""
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
msgid "The percent value must be between 0 and 100, inclusive"
msgstr ""
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Á¤ÀǾȵÊ"
-
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
msgid "None"
msgstr ""
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
msgid "Recurring"
msgstr "¹Ýº¹µÊ"
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
msgid "Assigned"
msgstr "¿¹¾àµÊ"
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
#: calendar/gui/e-meeting-model.c:702
msgid "Yes"
msgstr "¿¹"
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
#: calendar/gui/e-meeting-model.c:703
msgid "No"
msgstr "¾Æ´Ï¿À"
@@ -3333,42 +3335,42 @@ msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
msgid "Unmatched"
msgstr ""
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
msgid "Calendar"
msgstr "´Þ·Â"
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "ÀÛ¾÷"
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
#, fuzzy
msgid "Folder containing to-do items"
msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
#, fuzzy
msgid "New _Appointment"
msgstr "»õ ¾à¼Ó"
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
msgstr ""
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
#, fuzzy
msgid "New _Task"
msgstr "ÀÛ¾÷"
@@ -3449,105 +3451,126 @@ msgstr "½Ã"
msgid "minutes"
msgstr "ºÐ"
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
#, fuzzy, c-format
msgid "%d days"
msgstr " %d ³¯¾¿"
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
#, fuzzy
msgid "1 day"
msgstr "ÇϷ羿"
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
#, fuzzy, c-format
msgid "%d weeks"
msgstr " %d ÁÖ¾¿"
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
#, fuzzy
msgid "1 week"
msgstr " ÇÑÁÖ¾¿"
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
#, fuzzy, c-format
msgid "%d hours"
msgstr " %d ½Ã°£¾¿"
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
#, fuzzy
msgid "1 hour"
msgstr " Çѽ𣾿"
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
#, fuzzy, c-format
msgid "%d minutes"
msgstr " %d ºÐ¸¶´Ù"
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
#, fuzzy
msgid "1 minute"
msgstr "ÀϺи¶´Ù"
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
#, fuzzy, c-format
msgid "%d seconds"
msgstr " %d Ãʸ¶´Ù"
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
#, fuzzy
msgid "1 second"
msgstr " 1 Ãʸ¶´Ù"
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "¼Ò¸® ¿¬ÁÖ"
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
#: calendar/gui/dialogs/alarm-page.glade.h:3
#, fuzzy
msgid "Display a message"
msgstr "¸ðµç ¸Þ½ÃÁö Çì´õ º¸À̱â"
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
msgid "Send an email"
msgstr "À̸ÞÀÏ º¸³»±â"
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "ÇÁ·Î±×·¥À» ±¸µ¿ÇÕ´Ï´Ù"
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
#, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
msgstr "¾à¼Ó½ÃÀÛÀü"
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
-msgstr "¾à¼Ó ½ÃÀÛÈÄ"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "¾à¼Ó½ÃÀÛÀü"
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr "¾à¼Ó ³¡³ª±âÀü"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "¾à¼Ó½ÃÀÛÀü"
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "¾à¼Ó½ÃÀÛÀü"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
msgstr "¾à¼Ó ³¡³­ ÈÄ"
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "¾à¼Ó ³¡³­ ÈÄ"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s ´º½º ¼­¹ö %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
#: calendar/gui/dialogs/alarm-page.glade.h:1
#: calendar/gui/dialogs/recurrence-page.glade.h:2
msgid "Basics"
@@ -3896,110 +3919,110 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
#, fuzzy
msgid " (Completed "
msgstr "¿Ï·áµÊ"
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
#, fuzzy
msgid "Completed "
msgstr "¿Ï·áµÊ"
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
msgid "Edit Appointment"
msgstr "¾à¼ÓÀ» ¼öÁ¤ÇÑ´Ù"
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
#, c-format
msgid "Appointment - %s"
msgstr "¾à¼Ó - %s"
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
#, c-format
msgid "Journal entry - %s"
msgstr "¿©Çà ÀÏÁ¤ - %s"
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
msgid "Unable to obtain current version!"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "Á¤¸»·Î ¾à¼Ó `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¾à¼ÓÀ» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
msgid "Are you sure you want to delete this untitled task?"
msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ÀÛ¾÷À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "Á¤¸»·Î ¿©ÇàÀÏÁ¤ `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "Á¤¸»·Î ÀÌ Á¦¸ñ¾ø´Â ¿©ÇàÀÏÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
#, fuzzy, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr "Á¤¸»·Î ¾à¼Ó `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
#, fuzzy, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
#, fuzzy, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr "Á¤¸»·Î ¿©ÇàÀÏÁ¤ `%s'À» Áö¿ì±â¸¦ ¿øÇϽʴϱî"
@@ -4198,7 +4221,7 @@ msgstr "»óÅÂ"
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr ""
@@ -4223,8 +4246,8 @@ msgstr "´Ù¸¥ À̵éÀ» ÃÊ´ë(_I)..."
msgid "_Other Organizer"
msgstr "Á¶Á÷:"
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
msgid "%a %b %d %Y"
msgstr ""
@@ -4345,7 +4368,7 @@ msgid "Progress"
msgstr "ÁøÇàÁß"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
msgid "URL:"
msgstr ""
@@ -4365,7 +4388,7 @@ msgstr "¿¹¾àµÊ"
#: calendar/gui/dialogs/task-page.glade.h:4
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
msgid "Description:"
msgstr "¼³¸í:"
@@ -4381,110 +4404,110 @@ msgstr ""
msgid "_Due Date:"
msgstr ""
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
#, c-format
msgid "0%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
#, c-format
msgid "10%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
#, c-format
msgid "20%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
#, c-format
msgid "30%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
#, c-format
msgid "40%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
#, c-format
msgid "50%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
#, c-format
msgid "60%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
#, c-format
msgid "70%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
#, c-format
msgid "80%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
#, c-format
msgid "90%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
#, c-format
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
#: shell/e-shortcuts-view.c:385
#, fuzzy
msgid "_Open"
msgstr "¿­±â"
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "ÀÚ¸£±â(_u)"
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr "º¹»ç(_C)"
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:17
msgid "_Paste"
msgstr "ºÙÀ̱â(_P)"
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
#, fuzzy
msgid "_Mark as Complete"
msgstr "¿Ï·á Ç¥½Ã"
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
#, fuzzy
msgid "_Delete this Task"
msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
#, fuzzy
msgid "_Mark Tasks as Complete"
msgstr "¿Ï·á Ç¥½Ã"
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
#, fuzzy
msgid "_Delete Selected Tasks"
msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
#: calendar/gui/e-calendar-table.etspec.h:6
#, fuzzy
msgid "Click to add a task"
@@ -4494,8 +4517,8 @@ msgstr "ÀÛ¾÷¸ñ·Ï¿¡ Ãß°¡Çϱâ"
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
#, fuzzy
msgid "Complete"
msgstr "¿Ï·áµÊ"
@@ -4527,8 +4550,8 @@ msgstr "½ÃÀÛÇÑ ³¯"
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
msgid "Summary"
msgstr "¿ä¾à"
@@ -4549,7 +4572,7 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
msgid "%A %d %B"
msgstr ""
@@ -4561,295 +4584,312 @@ msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
msgid "am"
msgstr "¿ÀÀü"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
msgid "pm"
msgstr "¿ÀÈÄ"
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr "¿À´Ã·Î À̵¿(_T)"
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
#, fuzzy
msgid "_Go to Date..."
msgstr "³¯Â¥·Î À̵¿..."
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
#, fuzzy
msgid "_Delete this Appointment"
msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
#, fuzzy
msgid "Make this Occurrence _Movable"
msgstr "ÇöÀç ÆÄÀÏÀ» ÀúÀå"
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
#, fuzzy
msgid "Delete this _Occurrence"
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÕ´Ï´Ù"
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
msgid "Delete _All Occurrences"
msgstr ""
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "»ç¿ëÀÚ Á¤º¸"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
#, c-format
msgid "<b>Summary:</b> %s<br><br>"
msgstr ""
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
#, fuzzy, c-format
msgid "<b>Description:</b> %s"
msgstr "¼³¸í:"
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
#, fuzzy
msgid "Meeting Information"
msgstr "Á¤º¸ ¾øÀ½"
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
#, fuzzy
msgid "Meeting Proposal"
msgstr "¹ÌÆà Ãë¼Ò"
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
#, fuzzy
msgid "Meeting Update"
msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
#, fuzzy, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
#, fuzzy
msgid "Meeting Reply"
msgstr "¹ÌÆà Ãë¼Ò"
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
#, fuzzy
msgid "Meeting Cancellation"
msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
#, fuzzy
msgid "Bad Meeting Message"
msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
#, fuzzy
msgid "Task Information"
msgstr "Á¤º¸"
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
#, fuzzy
msgid "Task Proposal"
msgstr "ÀÛ¾÷Æеå"
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
#, fuzzy
msgid "Task Update"
msgstr "ÀÛ¾÷"
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
#, fuzzy, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
#, fuzzy
msgid "Task Reply"
msgstr "ȸ½Å"
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
#, fuzzy
msgid "Task Cancellation"
msgstr "¹ÌÆà Ãë¼Ò"
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
#, fuzzy
msgid "Bad Task Message"
msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
#, fuzzy, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "»ç¿ëÀÚ Á¤º¸"
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
#, fuzzy
msgid "Free/Busy Information"
msgstr "»ç¿ëÀÚ Á¤º¸"
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
#, fuzzy, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
#, fuzzy
msgid "Bad Free/Busy Message"
msgstr "¸Þ¼¼Áö Àμâ"
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
#, fuzzy
msgid "Update complete\n"
msgstr "¿Ï·áµÈ ³¯Â¥:"
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
msgid "Attendee status ould not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
#, fuzzy
msgid "Attendee status updated\n"
msgstr "Âü¼®ÀÚ ÁÖ¼Ò"
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
msgid "I couldn't remove the item from your calendar file!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
#, fuzzy
msgid "Removal Complete"
msgstr "% ¿Ï·á(_p):"
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
#, fuzzy
msgid "Item sent!\n"
msgstr "º¸³½ ³¯Â¥"
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
msgid "Unable to find any of your identities in the attendees list!\n"
msgstr ""
@@ -4913,6 +4953,14 @@ msgstr "±ÞÁö¹æ¹ý:"
msgid "Room"
msgstr ""
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
#: calendar/gui/e-meeting-model.c:686
msgid "Chair"
@@ -4970,14 +5018,14 @@ msgstr "ÁøÇàÁß"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
msgid "%A, %B %d, %Y"
msgstr ""
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
#: e-util/e-time-utils.c:345
msgid "%a %m/%d/%Y"
msgstr ""
@@ -4985,7 +5033,7 @@ msgstr ""
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
msgid "%m/%d/%Y"
msgstr "%Y/%m/%d"
@@ -5063,17 +5111,17 @@ msgstr ""
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
#, fuzzy
msgid "New _Appointment..."
msgstr "»õ ¾à¼Ó..."
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "`%s'¿¡ÀÖ´Â Æú´õ¸¦ ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
@@ -5144,202 +5192,202 @@ msgstr ""
msgid "Could not create the component editor factory"
msgstr "¾Ë¶÷ ±â´É ÆÑÅ丮¸¦ ¸¸µé¼ö°¡ ¾ø½À´Ï´Ù"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "1st"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "2nd"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "3rd"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "4th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "5th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "6th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "7th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "8th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "9th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "10th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "11th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "12th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "13th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "14th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "15th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "16th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "17th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "18th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "19th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "20th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "21st"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "22nd"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "23rd"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "24th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "25th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "26th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "27th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "28th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "29th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "30th"
msgstr ""
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
msgid "31st"
msgstr ""
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Su"
msgstr ""
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Mo"
msgstr ""
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Tu"
msgstr ""
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "We"
msgstr ""
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Th"
msgstr ""
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Fr"
msgstr ""
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Sa"
msgstr ""
#. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
msgid "Selected day (%a %b %d %Y)"
msgstr ""
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
msgid "%a %b %d"
msgstr ""
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
msgid "%a %d %Y"
msgstr ""
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
#, c-format
msgid "Selected week (%s - %s)"
msgstr ""
#. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
msgid "Selected month (%b %Y)"
msgstr ""
#. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
msgid "Selected year (%Y)"
msgstr ""
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
msgid "Print Calendar"
msgstr ""
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
msgid "Print Preview"
msgstr "Àμ⠹̸®º¸±â"
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
#, fuzzy
msgid "Print Item"
msgstr "ÀÌ Ç׸ñÀ» Àμâ"
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
msgid "Print Setup"
msgstr "Àμ⠼³Á¤"
@@ -5528,72 +5576,89 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr ""
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
msgid "You must be working online to complete this operation"
msgstr ""
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
#, fuzzy
msgid "Syncing folders"
msgstr "Æú´õ µ¿±âÈ­"
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
#, fuzzy
msgid "Unable to open spool folder"
msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
#, fuzzy
msgid "Unable to process spool folder"
msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
#, fuzzy, c-format
msgid "Getting message %d (%d%%)"
msgstr "¸Þ¼¼Áö %s¸¦ °¡Á®¿À±â"
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
#, fuzzy, c-format
msgid "Failed on message %d"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
#, fuzzy
msgid "Cannot open message"
msgstr ""
"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
" %s"
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
#, fuzzy
msgid "Syncing folder"
msgstr "Æú´õ µ¿±âÈ­"
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
#, fuzzy, c-format
msgid "Getting message %d of %d"
msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
#, fuzzy, c-format
msgid "Failed at message %d of %d"
msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "ÇÊÅÍ ºÐ¼®Áß ¿À·ù: %s: %s"
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "ÇÊÅÍ Ã£±â ½ÇÇàÁß ¿À·ù: %s: %s"
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"ã±â¸¦ ¼öÇ൵Áß ¿À·ù: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "¸Þ¼¼Áö º¹»ç"
+
#: camel/camel-folder-search.c:333
#, c-format
msgid ""
@@ -5619,7 +5684,7 @@ msgstr ""
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
msgid "Invalid type in body-contains, expecting string"
msgstr ""
@@ -5718,76 +5783,76 @@ msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
msgid "Error copying mail temp file: %s"
msgstr "¸ÞÀÏ ÀÓ½ÃÆÄÀÏÀ» ¾²´ÂÁß ¿À·ù¹ß»ý: %s"
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
#, c-format
msgid "Please enter your %s passphrase for %s"
msgstr ""
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
#, c-format
msgid "Please enter your %s passphrase"
msgstr ""
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
#, fuzzy
msgid "Cannot sign this message: no plaintext to sign"
msgstr ""
"¸Þ¼¼Áö¸¦ ¾òÀ»¼ö ¾øÀ½: %s\n"
" %s"
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
msgid "Cannot sign this message: no password provided"
msgstr ""
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
#, c-format
msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
msgid "Cannot sign this message: no plaintext to clearsign"
msgstr ""
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
msgid "Cannot verify this message: no plaintext to verify"
msgstr ""
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
#, c-format
msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
#, fuzzy, c-format
msgid "Cannot verify this message: couldn't create temp file: %s"
msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
msgid "Cannot encrypt this message: no plaintext to encrypt"
msgstr ""
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
msgid "Cannot encrypt this message: no password provided"
msgstr ""
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
#, c-format
msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
msgid "Cannot encrypt this message: no recipients specified"
msgstr ""
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
msgid "Cannot decrypt this message: no ciphertext to decrypt"
msgstr ""
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
msgid "Cannot decrypt this message: no password provided"
msgstr ""
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
#, c-format
msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
@@ -5831,13 +5896,13 @@ msgstr ""
msgid "(unknown host)"
msgstr "(¸ð¸£´Â È£½ºÆ®)"
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr "ÀÛ¾÷ Ãë¼Ò"
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -5935,7 +6000,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
msgid "Bad authentication response from server."
msgstr ""
@@ -5954,7 +6019,7 @@ msgstr "ÀÎÁõ ½ÇÆÐ."
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
msgid "Password"
msgstr "ºñ¹Ð¹øÈ£"
@@ -5983,37 +6048,37 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
@@ -6026,12 +6091,12 @@ msgstr ""
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -6083,7 +6148,7 @@ msgstr ""
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
#, c-format
msgid ""
"Issuer: %s\n"
@@ -6091,7 +6156,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -6118,17 +6183,37 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
#, fuzzy, c-format
msgid "No such message %s in %s"
msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½: %s"
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
#, c-format
msgid "No such message: %s"
msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½: %s"
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
#, fuzzy
msgid "You cannot copy messages from this trash folder."
msgstr ""
@@ -6180,7 +6265,7 @@ msgid "Scanning for changed messages"
msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
msgid "This message is not currently available"
msgstr "ÀÌ ¸Þ½ÃÁö´Â ÇöÀç º¸¿©ÁÙ ¼ö°¡ ¾ø½À´Ï´Ù"
@@ -6194,7 +6279,7 @@ msgstr ""
msgid "Scanning for new messages"
msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -6213,7 +6298,7 @@ msgstr ""
msgid "Failed to cache message %s: %s"
msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
#, fuzzy
msgid "Checking for new mail"
msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
@@ -6223,7 +6308,7 @@ msgstr "»õ ÆíÁö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
msgid "Check for new messages in all folders"
msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
msgid "Folders"
msgstr "Æú´õ"
@@ -6256,28 +6341,28 @@ msgstr ""
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
#: camel/providers/smtp/camel-smtp-transport.c:388
#, c-format
msgid "No support for authentication type %s"
msgstr "%s ŸÀÔ ÀÎÁõÀ» Áö¿ø ¾ÈÇÔ"
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
#: camel/providers/smtp/camel-smtp-transport.c:432
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -6285,12 +6370,12 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
#, c-format
msgid "No such folder %s"
msgstr "%s°°Àº Æú´õ°¡ ¾øÀ½"
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -6324,51 +6409,51 @@ msgstr ""
msgid "For storing local mail in qmail maildir directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
msgid "Standard Unix mbox spools"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
msgid "For reading and storing local mail in standard mbox spool files."
msgstr ""
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
#, c-format
msgid "Local mail file %s"
msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
@@ -6652,26 +6737,26 @@ msgstr ""
msgid "Cannot append message to spool file: %s: %s"
msgstr "¸ÞÀÏÆú´õ¿¡ ¸Þ¼¼Áö¸¦ µ¡ºÙÀϼö ¾ø½À´Ï´Ù: %s: %s"
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Spool `%s' does not exist or is not a regular file"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
#, fuzzy, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
#, fuzzy, c-format
msgid "Spool mail file %s"
msgstr "·ÎÄÃ ¸ÞÀÏ ÆÄÀÏ %s"
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
msgid "Spool folders cannot be deleted"
msgstr ""
@@ -6798,31 +6883,31 @@ msgstr "POP ¿ä¾àÀ» °¡Á®¿È"
msgid "Could not check POP server for new messages: %s"
msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
msgid "Could not open folder: message listing was incomplete."
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
#, fuzzy
msgid "Expunging deleted messages"
msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
#, fuzzy, c-format
msgid "Could not fetch message: %s"
msgstr "¸Þ¼¼Áö¸¦ º¸³¾¼ö ¾øÀ½: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
#, c-format
msgid "No message with uid %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
#, c-format
msgid "Retrieving POP message %d"
msgstr "POP ¸Þ¼¼Áö %d¸¦ °¡Á®¿È"
@@ -6842,7 +6927,7 @@ msgstr "¼­¹ö¿¡ ¸ÞÀÏ ³²±â±â"
msgid "Delete after %s day(s)"
msgstr "ÀÌ ÀÏÁ¤¸¦ »èÁ¦ÇÕ´Ï´Ù"
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
msgid "POP"
msgstr ""
@@ -6924,7 +7009,7 @@ msgid "Unexpected response from POP server: %s"
msgstr "IMAP server·ÎºÎÅÍ ¿¹»óÄ¡¸øÇÑ ´äº¯: %s"
#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
msgid "Sendmail"
msgstr ""
@@ -6976,7 +7061,7 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr "sendmailÀ» ÅëÇÑ ¸ÞÀÏ Àü´Þ"
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
msgid "SMTP"
msgstr ""
@@ -7605,13 +7690,13 @@ msgstr ""
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
msgid "%H:%M"
msgstr ""
@@ -7753,8 +7838,8 @@ msgstr ""
"ÂÁ, Æú´õ °í¸£´Â °ÍÀ» ÀØÀ¸¼Ì³×¿ä.\n"
"µÚ·Î µ¹¾Æ°¡ ¸ÞÀÏÀ» ¹è´ÞÇÒ Æú´õ¸¦ ÁöÁ¤Çϼ¼¿ä."
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
msgid "Select Folder"
msgstr "Æú´õ ¼±ÅÃ"
@@ -8007,7 +8092,7 @@ msgstr "ȸ½Å"
msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
msgid "Sender"
msgstr "º¸³½ÀÌ"
@@ -8041,7 +8126,7 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr "Á¦¸ñ"
@@ -8072,7 +8157,7 @@ msgstr "Á¤½Ä À̸§ ÆíÁý"
msgid "Score Rules"
msgstr ""
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
msgid "Oops. You need to to specify at least one folder as a source."
msgstr ""
@@ -8091,7 +8176,7 @@ msgstr "°¡Á®¿À±â"
msgid "Please wait"
msgstr ""
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
#: importers/pine-importer.c:369
#, fuzzy, c-format
msgid "Importing %s as %s"
@@ -8099,13 +8184,13 @@ msgstr ""
"%sÀ» °¡Á®¿À±â.\n"
"%s¸¦ ½ÃÀÛÇÕ´Ï´Ù"
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
#: importers/pine-importer.c:506
#, fuzzy, c-format
msgid "Scanning %s"
msgstr "\"%s\" º¸³»´Â Áß"
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
#: importers/pine-importer.c:669 mail/component-factory.c:96
msgid "Mail"
msgstr "ÆíÁö"
@@ -8140,22 +8225,22 @@ msgstr ""
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
#, fuzzy
msgid "Scanning directory"
msgstr "IMAP Æú´õ¸¦ »ìÆ캾´Ï´Ù"
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
#, fuzzy
msgid "Starting import"
msgstr "½ÃÀÛ ³¯Â¥(_S):"
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
#, fuzzy
msgid "Settings"
msgstr "¼³Á¤..."
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -8241,21 +8326,27 @@ msgstr "¼³Á¤(_P)..."
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
#, fuzzy
msgid "New Mail Message"
msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
#, fuzzy
msgid "New _Mail Message"
msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
msgid "Cannot initialize Evolution's mail component."
msgstr ""
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
msgid "Cannot register storage with shell"
msgstr ""
@@ -8268,172 +8359,172 @@ msgstr "\"%s\"¿¡´ëÇÑ ¼³Á¤"
msgid "Properties"
msgstr "¼³Á¤"
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Àӽà µð·ºÅ丮¸¦ ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù: %s"
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
#, c-format
msgid "%d new"
msgstr ""
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
msgid ", "
msgstr ""
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
#, fuzzy, c-format
msgid "%d selected"
msgstr "»èÁ¦µÊ"
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
#, fuzzy, c-format
msgid "%d unsent"
msgstr " %d Ãʸ¶´Ù"
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
#, c-format
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
#, fuzzy
msgid "Create vFolder from Search"
msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °Å¸£°Ô »ý¼º(_C)"
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
msgid "VFolder on _Subject"
msgstr "Á¦¸ñ¿¡µû¸¥ °¡»óÆú´õ(_S)"
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
msgid "VFolder on Se_nder"
msgstr "¹ß¼ÛÀÚ¿¡µû¸¥ °¡»óÆú´õ(_n)"
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
msgid "VFolder on _Recipients"
msgstr "¼ö½ÅÀÚ¿¡µû¸¥ °¡»óÆú´õ(_R)"
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
#, fuzzy
msgid "VFolder on Mailing _List"
msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
#, fuzzy
msgid "Filter on Sub_ject"
msgstr "Á¦¸ñ¿¡´ëÇÑ °Å¸£°Ô(_S)"
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
#, fuzzy
msgid "Filter on Sen_der"
msgstr "¹ß¼ÛÀο¡´ëÇÑ °Å¸£°Ô(_n)"
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
#, fuzzy
msgid "Filter on Re_cipients"
msgstr "¼ö½ÅÀο¡´ëÇÑ °Å¸£°Ô(_R)"
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
#, fuzzy
msgid "Filter on _Mailing List"
msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
#, fuzzy
msgid "_Edit as New Message..."
msgstr "¸Þ¼¼Áö Àμâ"
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
msgid "_Save As..."
msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_S)..."
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
msgid "_Print"
msgstr "Àμâ(_P)"
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
#, fuzzy
msgid "_Reply to Sender"
msgstr "º¸³½ »ç¶÷¿¡°Ô ȸ½Å"
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
#, fuzzy
msgid "Reply to _List"
msgstr "Àüü ȸ½Å(_A)"
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
msgid "Reply to _All"
msgstr "Àüü ȸ½Å(_A)"
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
msgid "_Forward"
msgstr "Àü´Þ(_F)"
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
msgid "Mar_k as Read"
msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_k)"
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
msgid "Mark as U_nread"
msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã(_n)"
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
#, fuzzy
msgid "Mark as _Important"
msgstr "Áß¿ä"
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
#, fuzzy
msgid "Mark as Unim_portant"
msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
msgid "_Move to Folder..."
msgstr "Æú´õ·Î À̵¿(_M)..."
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
msgid "_Copy to Folder..."
msgstr "Æú´õ·Î º¹»ç(_C)..."
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
msgid "_Undelete"
msgstr "µÇ»ì¸²(_U)"
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
#, fuzzy
msgid "Add Sender to Address Book"
msgstr "ÁÖ¼Ò·Ï Ãß°¡"
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
msgid "Apply Filters"
msgstr "°Å¸£°³ Àû¿ë"
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
#, fuzzy
msgid "Create Ru_le From Message"
msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °Å¸£°Ô »ý¼º(_C)"
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
msgid "Filter on Mailing List"
msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
msgid "VFolder on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr ""
@@ -8508,17 +8599,17 @@ msgstr "Evolution ¼³Ä¡"
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
#, fuzzy
msgid "Could not save signature file."
msgstr "Àӽà Æú´õ¸¦ ´ÝÀ»¼ö ¾øÀ½: %s"
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
#, fuzzy
msgid "Save signature"
msgstr "¼­¸í:"
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
#, fuzzy
msgid ""
"This signature has been changed, but hasn't been saved.\n"
@@ -8529,7 +8620,7 @@ msgstr ""
"\n"
"º¯°æµÈ ³»¿ëÀ» ÀúÀåÇϽðڽÀ´Ï±î?"
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -8564,7 +8655,7 @@ msgid "Are you sure you want to delete this news account?"
msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
#, fuzzy
msgid "Mail Settings"
msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
@@ -8656,71 +8747,71 @@ msgstr ""
msgid "This message contains invalid recipients:"
msgstr ""
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
#, fuzzy
msgid "an unknown sender"
msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
#, fuzzy, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
#, fuzzy, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
#, fuzzy
msgid "No Message Selected"
msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
msgid "Save Message As..."
msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
msgid "Save Messages As..."
msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "°æ°í"
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8728,32 +8819,32 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
#, fuzzy
msgid "Do not ask me again."
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã º¼ ¼ö ¾ø½À´Ï´Ù"
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
#, fuzzy
msgid "Filters"
msgstr "ÆíÁö °Å¸£°³(_F)..."
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
msgid "Print Message"
msgstr "¸Þ¼¼Áö Àμâ"
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
msgid "Printing of message failed"
msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
#, fuzzy, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
@@ -8800,89 +8891,109 @@ msgstr ""
msgid "Evolution Account Assistant"
msgstr "Evolution °èÁ¤ ¸¶¹ý»ç"
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "°èÁ¤"
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
#: mail/mail-config.c:1618
#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
msgid "%s: Inbox"
msgstr ""
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
msgid "Connecting to server..."
msgstr ""
#: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
msgid " color"
msgstr "»ö»ó"
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
msgid "(SSL is not supported in this build of evolution)"
msgstr ""
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "Account"
msgstr "°èÁ¤"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "Account Information"
msgstr "°èÁ¤ Á¤º¸"
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "°èÁ¤ °ü¸®"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
#, fuzzy
msgid "Accounts"
msgstr "°èÁ¤"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
msgid "Always encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
msgid "Always encrypt to myself when sending encrypyed mail"
msgstr ""
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
msgid "Always sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "÷ºÎ"
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
msgid "Authentication"
msgstr "ÀÎÁõ:"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "Authentication Type: "
msgstr "ÀÎÁõ Á¾·ù:"
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
msgid "Certificate ID:"
msgstr ""
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
#, fuzzy
msgid "Composer"
msgstr "ÆíÁö ÀÛ¼º"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "¸ÞÀÏ ¼³Á¤"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Æú´õ ºñ¿ì±â"
+
+#: mail/mail-config.glade.h:19
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8892,347 +9003,330 @@ msgid ""
"Click \"Finish\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
msgid "Default Forward style is: "
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
msgid "Default character encoding: "
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
msgid "Digital IDs..."
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
msgid "Display"
msgstr "Ç¥½Ã"
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "¿Ï·á"
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
#, fuzzy
msgid "Drafts"
msgstr "ÃÊ°í"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
#, fuzzy
msgid "Drafts folder:"
msgstr "»õ Æú´õ¸¦ »ý¼º"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
msgid "E_nable"
msgstr ""
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "ÇöÀç ÆÄÀÏÀ» ´Ù¸¥À̸§À¸·Î ÀúÀåÇÕ´Ï´Ù"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
#: widgets/misc/e-filter-bar.h:103
#, fuzzy
msgid "Edit..."
msgstr "ÆíÁý"
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
msgid "Enabled"
msgstr ""
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
msgid "Get Digital ID..."
msgstr ""
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
#, fuzzy
msgid "HTML signature file:"
msgstr "¼­¸í:"
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr ""
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
msgid "In HTML mail"
msgstr ""
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
#, fuzzy
msgid "Inline"
msgstr "¹Ý´ë"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
msgid "Mail Configuration"
msgstr "¸ÞÀÏ ¼³Á¤"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
#, fuzzy
msgid "Mailbox location"
msgstr "¸ÞÀϹڽº Çü½Ä"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
#, fuzzy
msgid "Make this my _default account"
msgstr "±âº» °èÁ¤À¸·Î Çϱâ"
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
#, fuzzy
msgid "NNTP Server:"
msgstr "LDAP ¼­¹ö"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
msgid "News"
msgstr "´º½º"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
#, fuzzy
msgid "Optional Information"
msgstr "Á¤º¸ ¾øÀ½"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
msgid "PGP Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
msgid "Pick a color"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
msgid "Pretty Good Privacy"
msgstr ""
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
msgid "Prompt when sending messages with an _empty subject"
msgstr ""
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
msgid "Prompt when sending messages with only _Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
#, fuzzy
msgid "Quoted"
msgstr "Àοë(_Q)"
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "ÆíÁö¸¦ ¹ÞÀ½"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
#, fuzzy
msgid "Receiving Mail"
msgstr "ÆíÁö¸¦ ¹ÞÀ½"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
#, fuzzy
msgid "Receiving Options"
msgstr "¹Þ¾ÒÀ½"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
#, fuzzy
msgid "Required Information"
msgstr "»ç¿ëÀÚ Á¤º¸"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
msgid "Secure MIME"
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
#, fuzzy
msgid "Security"
msgstr "º¸¾È(_S)"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
#, fuzzy
msgid "Select Filter Log file..."
msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
msgid "Select PGP binary"
msgstr "PGP ÇÁ·Î±×·¥ ÆÄÀÏÀ» ¼±ÅÃ"
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "ÆíÁö¸¦ º¸³¿"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Sending Mail"
msgstr "ÆíÁö¸¦ º¸³¿"
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
#: shell/e-local-storage.c:177
#, fuzzy
msgid "Sent"
msgstr "º¸³¿"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Sent and Draft Messages"
msgstr "¸Þ¼¼ÁöµéÀ» ´Ù½Ã º¸³»±â(_R)"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
#, fuzzy
msgid "Sent messages folder:"
msgstr "¸Þ¼¼Áö¸¦ Æú´õ·Î ÀúÀå"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
msgid "Server Configuration"
msgstr "¼­¹ö ¼³Á¤"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
msgid "Server Type: "
msgstr "¼­¹ö Á¾·ù: "
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
#, fuzzy
msgid "Server requires _authentication"
msgstr "¼­¹ö°¡ ÀÎÁõÀ» ¿ä±¸ÇÕ´Ï´Ù"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
msgid "Signature file:"
msgstr "¼­¸í ÆÄÀÏ:"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
msgid "Source"
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
#, fuzzy
msgid "Source Information"
msgstr "Á¤º¸ ¾øÀ½"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
msgid "Sources"
msgstr ""
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
#, fuzzy
msgid "Special Folders"
msgstr "°¡»ó Æú´õ"
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
msgid "Use secure connection (_SSL)"
msgstr ""
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
msgid "_Always load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
msgid "_Automatically check for new mail every"
msgstr ""
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
msgid "_Check for supported types"
msgstr ""
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
#, fuzzy
msgid "_Email Address:"
msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
msgid "_Empty trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
#, fuzzy
msgid "_Full Name:"
msgstr "ÀüüÀ̸§:"
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
#, fuzzy
msgid "_HTML Signature:"
msgstr "¼­¸í:"
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
msgid "_Highlight citations with"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
#, fuzzy
msgid "_Host:"
msgstr "È£½ºÆ®:"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
msgid "_Load images if sender is in addressbook"
msgstr ""
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "_Log filter actions to:"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
#, fuzzy
msgid "_Mark messages as Read after"
msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
#, fuzzy
msgid "_Name:"
msgstr "À̸§:"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
#, fuzzy
msgid "_Organization:"
msgstr "Á¶Á÷:"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
#, fuzzy
msgid "_PGP binary path:"
msgstr "PGP °æ·Î"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
#, fuzzy
msgid "_Path:"
msgstr "°æ·Î:"
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
#: mail/mail-config.glade.h:111
#, fuzzy
msgid "_Remember this password"
@@ -9270,44 +9364,44 @@ msgstr ""
msgid "seconds."
msgstr "ÃÊ."
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
msgid "Could not create a PGP signature context."
msgstr ""
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
msgid "Could not create a PGP verification context."
msgstr ""
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
#, fuzzy
msgid "Could not create a PGP encryption context."
msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
#, fuzzy
msgid "Could not create a PGP decryption context."
msgstr ""
"%s µð·ºÅ丮¸¦ »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
"%s"
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
msgid "Could not create a S/MIME signature context."
msgstr ""
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
msgid "Could not create a S/MIME certsonly context."
msgstr ""
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
msgid "Could not create a S/MIME encryption context."
msgstr ""
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
#, fuzzy
msgid "Could not create a S/MIME envelope context."
msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
#, fuzzy
msgid "Could not create a S/MIME decode context."
msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
@@ -9355,12 +9449,12 @@ msgstr ""
msgid "Copy Link Location"
msgstr "¼±ÅÃÇÑ°Í º¹»ç"
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
#, fuzzy
msgid "Save Link as (FIXME)"
msgstr "Æú´õ·Î ÀúÀå(_f)... (°íÄ¥¿¹Á¤)"
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
#, fuzzy
msgid "Save Image as..."
msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
@@ -9378,138 +9472,138 @@ msgstr ""
msgid "Date"
msgstr "³¯Â¥"
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
#, fuzzy
msgid "Bad Address"
msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
msgid "From"
msgstr "º¸³½ÀÌ"
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
#, fuzzy
msgid "Reply-To"
msgstr "ȸ½Å ÁÖ¼Ò:"
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
msgid "To"
msgstr "¹Þ´Â»ç¶÷"
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
#, fuzzy
msgid "Cc"
msgstr "ÂüÁ¶:"
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
#, fuzzy
msgid "No GPG/PGP program configured."
msgstr "GPG/PGP ÇÁ·Î±×·¥ÀÌ ¾ø½À´Ï´Ù."
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
msgid "Encrypted message not displayed"
msgstr "¾ÏȣȭµÈ ¸Þ½ÃÁö´Â º¸ÀÌÁö¾ÊÀ½"
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
msgid "Encrypted message"
msgstr "¾ÏȣȭµÈ ¸Þ¼¼Áö"
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
msgid "Click icon to decrypt."
msgstr ""
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
#, fuzzy
msgid "Reconfiguring folder"
msgstr "Æú´õ Àç¼³Á¤"
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
#, fuzzy, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
#, fuzzy, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "\"%s\" Æú´õ¸¦ \"%s\" Æ÷¸äÀ¸·Î ¹Ù²Ù±â"
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
#, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
msgstr "%s ¼³Á¤"
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -9519,21 +9613,25 @@ msgstr ""
"%s"
#. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
msgid "Remember this password"
msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
#, fuzzy
msgid "Enter Password"
msgstr "ºñ¹Ð¹øÈ£"
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
msgid "Working"
msgstr ""
@@ -9691,6 +9789,11 @@ msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
msgid "Disconnecting from %s"
msgstr ""
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "¹Þ¾ÒÀ½"
+
#: mail/mail-search-dialogue.c:113
msgid "_Search"
msgstr "°Ë»ö(_S)"
@@ -9754,12 +9857,12 @@ msgstr ""
msgid "Type: %s"
msgstr "ÇüÅÂ:"
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
#, fuzzy
msgid "Send & Receive Mail"
msgstr "ÆíÁö ÁÖ°í¹Þ±â"
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
#, fuzzy
msgid "Cancel All"
msgstr "Ãë¼ÒµÊ"
@@ -9783,36 +9886,50 @@ msgstr "Ãë¼ÒµÊ."
msgid "User canceled operation."
msgstr "»ç¿ëÀÚ Á¤º¸"
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "Àӽà mbox `%s'¸¦ ¸¸µé¼ö°¡ ¾ø½À´Ï´Ù: %s"
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
#, c-format
msgid "Forwarded message - %s"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö - %s"
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
#, fuzzy
msgid "Forwarded message"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
#, fuzzy
msgid "Forwarded Message"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
#, fuzzy, c-format
msgid "Setting up vfolder: %s"
msgstr "%s Æú´õ¸¦ ¿­±â"
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "%s Æú´õ¸¦ ¿­±â"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+" '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
msgid "VFolders"
msgstr "°¡»ó Æú´õ"
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
msgid "New VFolder"
msgstr "»õ °¡»óÆú´õ"
@@ -9882,7 +9999,7 @@ msgstr ""
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
#, fuzzy
msgid "Generating message list"
msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
@@ -9974,34 +10091,34 @@ msgstr "±¸µ¶ ÁßÁö"
msgid "Evolution component for the executive summary."
msgstr ""
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
msgid "Folder containing the Evolution Summary"
msgstr ""
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr ""
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
#, fuzzy
msgid "Appointments"
msgstr "¾à¼Ó"
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
#, fuzzy
msgid "No appointments"
msgstr "¾à¼Ó º¸±â"
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
msgid "%k%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
#, fuzzy
msgid "%l:%M %d %B"
msgstr "¿À´Ã %l:%M %p"
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
#, fuzzy
msgid "Mail summary"
msgstr "¿ä¾à"
@@ -10010,90 +10127,90 @@ msgstr "¿ä¾à"
#. see in My Evolution by default. You can find the list of all
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
msgid "KBOS:ZSAM:EGAA"
msgstr ""
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
msgid "Name:"
msgstr "À̸§:"
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
#, fuzzy
msgid "Summary Settings"
msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
#, fuzzy
msgid "Error downloading RDF"
msgstr "<b>´Þ·Â¸¦ ÀдÂÁß ¿À·ù</b>"
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
#, fuzzy
msgid "News Feed"
msgstr "»õ °¡»óÆú´õ(_N)"
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
#, fuzzy
msgid "No tasks"
msgstr "¾÷¹«"
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
#, fuzzy
msgid "(No Description)"
msgstr "¼³¸í:"
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr ""
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
#, fuzzy
msgid "Weather"
msgstr "±âŸ"
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
#, fuzzy
msgid "Regions"
msgstr "¼½¼Ç:"
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
msgid "%A, %B %e %Y"
msgstr ""
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
#, fuzzy
msgid "Print Summary"
msgstr "¿ä¾à"
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
#, fuzzy
msgid "Printing of Summary failed"
msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
#, fuzzy
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
@@ -11529,77 +11646,76 @@ msgid ""
"to allow installation of the Evolution user files."
msgstr ""
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
#, fuzzy
msgid "Cannot move a folder over itself."
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
#, fuzzy
msgid "Cannot copy a folder over itself."
msgstr ""
"`%s'·Î ÆÄÀÏÀ»\n"
"º¹»çÇÒ ¼ö°¡ ¾ø½À´Ï´Ù."
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
msgid "Cannot move a folder into one of its descendants."
msgstr ""
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
#, fuzzy
msgid "Copy folder"
msgstr "Æú´õ·Î º¹»ç"
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
#, fuzzy
msgid "Move folder"
msgstr "Æú´õ·Î À̵¿"
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
#, fuzzy, c-format
msgid ""
"Cannot delete folder:\n"
"%s"
msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
#, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "Æú´õ ¼±ÅÃ"
+msgid "Delete \"%s\""
+msgstr "»èÁ¦"
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
#, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
msgstr "Á¤¸»·Î ÀÛ¾÷ `%s'¸¦ Áö¿ì±â¸¦ ¿øÇϽʴϱî"
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
#, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
msgstr "%s Æú´õ¸¦ ¿­±â"
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
#, fuzzy
-msgid "Rename"
-msgstr "±ÔÄ¢ À̸§: "
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Æú´õ À̸§:"
+msgid "Rename folder"
+msgstr "%s Æú´õ¸¦ ¿­±â"
#: shell/e-shell-folder-creation-dialog.c:111
#, c-format
@@ -11639,13 +11755,13 @@ msgstr "ÁöÁ¤ÇϽŠÆú´õÀÇ À̸§ÀÌ ÀûÀýÇÏÁö¾Ê½À´Ï´Ù"
msgid "Evolution - Create new folder"
msgstr "Evolution - »õ Æú´õ »ý¼º"
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
msgstr ""
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
msgid "New..."
msgstr "»õ·Î¿î..."
@@ -11653,7 +11769,11 @@ msgstr "»õ·Î¿î..."
msgid "(Untitled)"
msgstr "(Á¦¸ñ¾øÀ½)"
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -11662,9 +11782,13 @@ msgid ""
"to work it out."
msgstr ""
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
#, c-format
msgid ""
"Importing %s\n"
@@ -11672,7 +11796,7 @@ msgid ""
"Waiting 5 seconds to retry."
msgstr ""
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
#, c-format
msgid ""
"Importing %s\n"
@@ -11681,16 +11805,16 @@ msgstr ""
"%s¸¦ °¡Á®¿À´Â Áß\n"
"¾ÆÀÌÅÛ %d¸¦ °¡Á®¿È."
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
#, fuzzy, c-format
msgid "File %s does not exist"
msgstr "Æú´õ `%s'´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
msgid "You may only import to local folders"
msgstr ""
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -11699,11 +11823,11 @@ msgstr ""
"´ÙÀ½À» °¡Á®¿Ã ¼öÀÖ´Â µµ±¸°¡ ¾ø½À´Ï´Ù\n"
"%s"
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
msgid "Importing"
msgstr "°¡Á®¿À±â"
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
#, c-format
msgid ""
"Importing %s.\n"
@@ -11712,17 +11836,17 @@ msgstr ""
"%sÀ» °¡Á®¿À±â.\n"
"%s¸¦ ½ÃÀÛÇÕ´Ï´Ù"
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
#, fuzzy, c-format
msgid "Error starting %s"
msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
#, c-format
msgid "Error loading %s"
msgstr "%sÀ»(¸¦) ÀдÂÁß ¿À·ù ¹ß»ý"
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
#, c-format
msgid ""
"Importing %s\n"
@@ -11731,32 +11855,56 @@ msgstr ""
"%s¸¦ °¡Á®¿À´Â Áß\n"
"¾ÆÀÌÅÛ 1À» °¡Á®¿È."
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
msgid "Automatic"
msgstr "ÀÚµ¿"
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
msgid "Filename:"
msgstr "ÆÄÀÏ À̸§:"
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
msgid "Select a file"
msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
msgid "File type:"
msgstr "ÆÄÀÏ Á¾·ù:"
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "°¡Á®¿À±â"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "º¸³½ »ç¶÷:"
+
+#: shell/e-shell-importer.c:1003
#, fuzzy
msgid "Select folder"
msgstr "Æú´õ ¼±ÅÃ"
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
msgid "Import"
msgstr "°¡Á®¿À±â"
@@ -11776,45 +11924,30 @@ msgstr ""
msgid "Cannot initialize the Evolution Mailer Wizard interface"
msgstr "Evolution ÀÛ¼º±â°¡ ÃʱâÈ­µÇÁö ¾Ê¾Ò½À´Ï´Ù."
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "º¸³½ »ç¶÷:"
-
#: shell/e-shell-startup-wizard.c:745
msgid ""
"Please select the information\n"
"that you would like to import"
msgstr ""
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
msgid "Bug buddy was not found in your $PATH."
msgstr "½Ã½ºÅÛÀÇ °æ·Î¿¡ Bug buddy¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù."
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
msgid "Bug buddy could not be run."
msgstr "Bug buddy¸¦ ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù."
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
#, fuzzy
msgid "Ximian Evolution"
msgstr "Evolution˼..."
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr ""
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
#, fuzzy
msgid ""
"Ximian Evolution is a suite of groupware applications\n"
@@ -11825,29 +11958,38 @@ msgstr ""
"ÀÏÁ¤, ¿¬¶ôó °ü¸®¸¦ ÇÏ´Â ±×·ì¿þ¾î ÀÀ¿ëÇÁ·Î±×·¥\n"
"¸ðÀ½ ÀÔ´Ï´Ù."
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
msgid "Go to folder..."
msgstr "Æú´õ À̵¿..."
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
msgid "Select the folder that you want to open"
msgstr ""
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
#, fuzzy
msgid "Create a new shortcut"
msgstr "»õ ´ÜÃà±×·ìÀ» »ý¼º"
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
#, fuzzy
msgid "Work Online"
msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
#: ui/evolution.xml.h:30
msgid "Work Offline"
msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
@@ -11856,46 +11998,46 @@ msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
msgid "(No folder displayed)"
msgstr "(Ç¥½ÃµÈ Æú´õ°¡ ¾øÀ½)"
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
#, fuzzy
msgid "(None)"
msgstr "(À̸§ ¾øÀ½)"
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
#, c-format
msgid "%s - Ximian Evolution %s"
msgstr ""
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
#, c-format
msgid "%s - Ximian Evolution %s [%s]"
msgstr ""
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "½Ã½ºÅÛ ÀúÀåÀåÄ¡¸¦ ÁöÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù -- %s"
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
#, fuzzy, c-format
msgid ""
"Ooops! The views for `%s' have died unexpectedly. :-(\n"
@@ -11904,24 +12046,24 @@ msgstr ""
"ÂÁ!! `%s' ºä°¡ ¸»µµ ¾øÀÌ Á×¾ú³×¿ä :-(\n"
"%s ÄÄÆ÷³ÍÆ®°¡ »ç¸ÁÇϽŰŠ°°½À´Ï´Ù."
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr "È®ÀÎ"
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
#, fuzzy
msgid "Configuration Database not found"
msgstr "¸ÞÀÏ ¼³Á¤ Druid"
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
msgid "Generic error"
msgstr "ÀÏ¹Ý ¿À·ù"
@@ -12057,52 +12199,59 @@ msgstr ""
msgid "Shortcuts"
msgstr "´ÜÃà ¸·´ë(_S)"
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+
#: shell/e-storage.c:182 shell/e-storage.c:188
msgid "(No name)"
msgstr "(À̸§ ¾øÀ½)"
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
msgid "No error"
msgstr "¿¡·¯ ¾øÀ½"
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
msgid "A folder with the same name already exists"
msgstr "°°Àº À̸§ÀÇ Æú´õ°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù"
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
msgid "The specified folder type is not valid"
msgstr "ÁöÁ¤µÈ ÆúÅÍ Çü½ÄÀÌ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù"
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
msgid "I/O error"
msgstr "ÀÔÃâ·Â ¿À·ù"
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
msgid "Not enough space to create the folder"
msgstr "Æú´õ¸¦ ¸¸µé±â¿¡ ÃæºÐÇÑ °ø°£ÀÌ ¾øÀ½"
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
msgid "The specified folder was not found"
msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
msgid "Function not implemented in this storage"
msgstr ""
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
msgid "Operation not supported"
msgstr "ÀÛµ¿ÀÌ Áö¿øµÇÁö ¾ÊÀ½"
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
msgid "The specified type is not supported in this storage"
msgstr "ÀÌ ÀúÀå¸Åü¿¡ ÁöÁ¤µÈ Çü½ÄÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
#, fuzzy
msgid "The specified folder cannot be modified or removed"
msgstr "ÁöÁ¤µÈ Æú´õ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù"
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
@@ -12134,6 +12283,10 @@ msgstr "È£½ºÆ®:"
msgid "The following connections are currently active:"
msgstr ""
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Æú´õ À̸§:"
+
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder type:"
msgstr "Æú´õ Á¾·ù:"
@@ -12190,15 +12343,25 @@ msgid "Evolution Importer Assistant"
msgstr "Evolution ¼³Ä¡"
#: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
#: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
#, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "ÆÄÀÏÀ» °í¸£¼¼¿ä"
+
+#: shell/importer/import.glade.h:8
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of\n"
@@ -12420,13 +12583,6 @@ msgstr "¿¬¶ôó ã±â(_S)"
msgid "_Select All"
msgstr "ÀüºÎ ¼±ÅÃ(_S)"
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "µµ±¸(_T)"
-
#: ui/evolution-calendar.xml.h:2
msgid "Configure the calendar's settings"
msgstr ""
@@ -12620,8 +12776,8 @@ msgstr "ºä¸¦ %s·Î º¯°æ"
#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
#: ui/evolution.xml.h:36
msgid "_File"
msgstr "ÆÄÀÏ(_F)"
@@ -12642,8 +12798,8 @@ msgstr "¾à¼ÓÀ» ÀúÀåÇÑÈÄ ´ÙÀ̾ó·Î±×¸¦ ´Ý´Â´Ù"
#: ui/evolution-contact-editor.xml.h:15
#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
msgid "_Save"
msgstr "ÀúÀå(_S)"
@@ -13310,6 +13466,11 @@ msgstr "Ç¥½Ã"
msgid "_Open Message"
msgstr "¸Þ¼¼ÁöµéÀ» ´Ù½Ã º¸³»±â(_R)"
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "µµ±¸(_T)"
+
#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
msgid "Close this window"
msgstr "ÀÌ Ã¢À» ´Ý½À´Ï´Ù"
@@ -13321,8 +13482,8 @@ msgstr "ÀÌ Ã¢À» ´Ý½À´Ï´Ù"
msgid "_Close"
msgstr "´Ý±â(_C)"
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
msgid "_View"
msgstr "º¸±â(_V)"
@@ -13489,37 +13650,32 @@ msgid "_Cc Field"
msgstr "ÂüÁ¶ Ç׸ñ(_C)"
#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "µð¹ö±ë(_D)"
-
-#: ui/evolution-message-composer.xml.h:47
#, fuzzy
msgid "_Delete all"
msgstr "»èÁ¦(_D)"
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
msgid "_From Field"
msgstr "¹ß½Å Ç׸ñ(_F)"
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
msgid "_Insert"
msgstr "»ðÀÔ(_I)"
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
msgid "_Open..."
msgstr "¿­±â(_O)..."
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
msgid "_Reply-To Field"
msgstr "ȸ½Å ÁÖ¼Ò Ç׸ñ(_R)"
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
msgid "_Security"
msgstr "º¸¾È(_S)"
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
msgid "_Help"
msgstr "µµ¿ò¸»(_H)"
@@ -13668,7 +13824,7 @@ msgid "Exit the program"
msgstr "ÇÁ·Î±×·¥À» ¸¶Ä¨´Ï´Ù"
#: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
msgstr ""
#: ui/evolution.xml.h:17
@@ -13748,8 +13904,8 @@ msgstr "Æú´õ·Î °¡±â(_G)..."
#: ui/evolution.xml.h:41
#, fuzzy
-msgid "_Import File..."
-msgstr "Æú´õ·Î °¡±â(_G)..."
+msgid "_Import..."
+msgstr "°¡Á®¿À±â"
#: ui/evolution.xml.h:42
#, fuzzy
@@ -13766,19 +13922,24 @@ msgstr "»õ °¡»óÆú´õ(_N)"
#: ui/evolution.xml.h:45
#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
msgid "_Rename..."
msgstr "¿­±â(_O)..."
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
#, fuzzy
msgid "_Shortcut"
msgstr "´ÜÃà ¸·´ë(_S)"
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
msgid "_Shortcut Bar"
msgstr "´ÜÃà ¸·´ë(_S)"
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
#, fuzzy
msgid "_Work Offline"
msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
@@ -13890,11 +14051,11 @@ msgstr ""
msgid "%B %Y"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
msgid "Now"
msgstr "ÇöÀç"
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
msgid "Today"
msgstr "¿À´Ã"
@@ -14045,21 +14206,56 @@ msgstr "°³Àοë ÁÖ¼Ò·Ï ¼­¹ö"
msgid "The Personal Calendar Server; calendar factory"
msgstr ""
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): GNOME-VFS¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): ±×³ðÀ» ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
#, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Æú´õ¸¦ ¾òÀ»¼ö ¾ø½À´Ï´Ù: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "»ç¿ëÀÚ Á¤º¸"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "¾à¼Ó½ÃÀÛÀü"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "¾à¼Ó ½ÃÀÛÈÄ"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "¾à¼Ó ³¡³ª±âÀü"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution ´ÜÃà ¸·´ë(_s)"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "ÇöÀç ÆÄÀÏÀ» ´Ù¸¥À̸§À¸·Î ÀúÀåÇÕ´Ï´Ù"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Æú´õ ¼±ÅÃ"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "±ÔÄ¢ À̸§: "
+
+#~ msgid "_Debug"
+#~ msgstr "µð¹ö±ë(_D)"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "Æú´õ·Î °¡±â(_G)..."
#, fuzzy
#~ msgid "Done."
@@ -14433,9 +14629,6 @@ msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
#~ msgid "Renaming old folder and opening"
#~ msgstr "¿¹Àü Æú´õ¸¦ ´Ù¸¥ À̸§À¸·Î ¹Ù²Ù¾î¼­ ¿­±â"
-#~ msgid "Copying messages"
-#~ msgstr "¸Þ¼¼Áö º¹»ç"
-
#~ msgid "Do you accept?"
#~ msgstr "¹Þ¾ÆµéÀÌ°Ú½À´Ï±î?"