aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNam SungHyun <namsh@src.gnome.org>2001-03-23 09:37:08 +0800
committerNam SungHyun <namsh@src.gnome.org>2001-03-23 09:37:08 +0800
commit01e19198a88f491251dd2c3d824bd771eebc3e3e (patch)
tree3e833b37ef217200dc9098808f6df08b6d92c46c
parent93d35480d878e2bb02ffcc528a2fba6598cf28fc (diff)
downloadgsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar.gz
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar.bz2
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar.lz
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar.xz
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.tar.zst
gsoc2013-evolution-01e19198a88f491251dd2c3d824bd771eebc3e3e.zip
update by ChiDeok, Hwang <hwang@mizi.co.kr>
svn path=/trunk/; revision=8911
-rw-r--r--po/ko.po2076
1 files changed, 1026 insertions, 1050 deletions
diff --git a/po/ko.po b/po/ko.po
index 5011f70ea2..115a7e4390 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,22 +4,23 @@
# update by Sung-Hyun Nam 2000/09/08
# update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/12
# update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/15
+# update by ChiDeok Hwang <hwang@mizi.co.kr> 2001/03/23
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-12 00:15+0900\n"
-"PO-Revision-Date: 2001-03-15 16:12+0900\n"
+"POT-Creation-Date: 2001-03-23 01:31+0900\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3255
msgid "Card: "
msgstr "Ä«µå: "
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3257
msgid ""
"\n"
"Name: "
@@ -27,37 +28,37 @@ msgstr ""
"\n"
"À̸§: "
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3258
msgid ""
"\n"
" Prefix: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3259
msgid ""
"\n"
" Given: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3260
msgid ""
"\n"
" Additional: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3261
msgid ""
"\n"
" Family: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3262
msgid ""
"\n"
" Suffix: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3276
msgid ""
"\n"
"Birth Date: "
@@ -65,7 +66,7 @@ msgstr ""
"\n"
"»ýÀÏ: "
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3287
msgid ""
"\n"
"Address:"
@@ -73,25 +74,25 @@ msgstr ""
"\n"
"ÁÖ¼Ò:"
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3289
msgid ""
"\n"
" Postal Box: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3290
msgid ""
"\n"
" Ext: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3291
msgid ""
"\n"
" Street: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3292
msgid ""
"\n"
" City: "
@@ -99,7 +100,7 @@ msgstr ""
"\n"
" ½Ã/µµ: "
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3293
msgid ""
"\n"
" Region: "
@@ -107,7 +108,7 @@ msgstr ""
"\n"
" Áö¿ª: "
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3294
msgid ""
"\n"
" Postal Code: "
@@ -115,7 +116,7 @@ msgstr ""
"\n"
" ¿ìÆí ¹øÈ£: "
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3295
msgid ""
"\n"
" Country: "
@@ -123,13 +124,13 @@ msgstr ""
"\n"
" ±¹°¡: "
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3308
msgid ""
"\n"
"Delivery Label: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3320
msgid ""
"\n"
"Telephones:\n"
@@ -137,7 +138,7 @@ msgstr ""
"\n"
"ÀüÈ­¹øÈ£:\n"
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3323
msgid ""
"\n"
"Telephone:"
@@ -145,7 +146,7 @@ msgstr ""
"\n"
"ÀüÈ­¹øÈ£:"
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3347
msgid ""
"\n"
"E-mail:\n"
@@ -153,7 +154,7 @@ msgstr ""
"\n"
"ÀüÀÚ¿ìÆí:\n"
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3350
msgid ""
"\n"
"E-mail:"
@@ -161,13 +162,13 @@ msgstr ""
"\n"
"ÀüÀÚ¿ìÆí:"
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3369
msgid ""
"\n"
"Mailer: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3375
msgid ""
"\n"
"Time Zone: "
@@ -175,7 +176,7 @@ msgstr ""
"\n"
"½Ã°£´ë: "
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3383
msgid ""
"\n"
"Geo Location: "
@@ -183,7 +184,7 @@ msgstr ""
"\n"
"Áö¸®Àû À§Ä¡: "
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3387
msgid ""
"\n"
"Business Role: "
@@ -191,7 +192,7 @@ msgstr ""
"\n"
"Á÷Àå Á÷ÇÔ: "
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3399
msgid ""
"\n"
"Org: "
@@ -199,7 +200,7 @@ msgstr ""
"\n"
"±â°ü: "
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3400
msgid ""
"\n"
" Name: "
@@ -207,31 +208,31 @@ msgstr ""
"\n"
" À̸§: "
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3401
msgid ""
"\n"
" Unit: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3402
msgid ""
"\n"
" Unit2: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3403
msgid ""
"\n"
" Unit3: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3404
msgid ""
"\n"
" Unit4: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3408
msgid ""
"\n"
"Categories: "
@@ -239,7 +240,7 @@ msgstr ""
"\n"
"¸ñ·Ï: "
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3409
msgid ""
"\n"
"Comment: "
@@ -257,13 +258,13 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3422
msgid ""
"\n"
"Unique String: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3425
msgid ""
"\n"
"Public Key: "
@@ -291,123 +292,6 @@ msgstr "GnomeCard ÆÄÀÏÀ» EvolutionÀ¸·Î °¡Á®¿É´Ï´Ù"
msgid "Could not initialize Bonobo"
msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "µ¿±âÈ­"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "PilotÀ¸·ÎºÎÅÍ º¹»ç"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Pilot·Î º¹»ç"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "PilotÀ¸·ÎºÎÅÍ ÇÕħ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "PilotÀ¸·Î ÇÕħ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "¿ø ÀúÀÛÀÚ:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution ÁÖ¼Ò·Ï ºÎÇ°"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution¿ë ÁÖ¼Ò·Ï ºÎÇ° ¼³Á¤ µµ±¸.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "µ¿±âÈ­ ½ÇÇà"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "ºÎÇ° »óÅÂ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"¼³Á¤µÈ ÆÄÀÏ·µÀÌ ¾ø½À´Ï´Ù, ¸ÕÀú 'ÆÄÀÏ·µ\n"
-"¿¬°á ¼³Á¤'ijÇø´À» ¼±ÅÃÇϽʽÿÀ."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot µ¥¸ó¿¡ ¿¬°áµÇ¾îÀÖÁö¾ÊÀ½"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
#: addressbook/conduit/address-conduit.c:201
msgid "Cursor could not be loaded\n"
msgstr ""
@@ -437,7 +321,7 @@ msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:1
#: calendar/gui/e-meeting-dialog.glade.h:1
#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "Add"
msgstr "Ãß°¡"
@@ -478,7 +362,7 @@ msgstr "ÆÄÀÏ·Î ÀúÀå:"
#: addressbook/contact-editor/contact-editor.glade.h:10
#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
msgid "General"
msgstr "ÀÏ¹Ý Á¤º¸"
@@ -495,7 +379,7 @@ msgid "Phone Types"
msgstr "ÀüÈ­ ÇüÅÂ"
#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
msgid "Primary Email"
msgstr "À̸ÞÀÏ"
@@ -508,7 +392,7 @@ msgid "Web page address:"
msgstr "ȨÆäÀÌÁö ÁÖ¼Ò:"
#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
msgid "_Add"
msgstr "Ãß°¡(_A)"
@@ -533,8 +417,8 @@ msgid "_Company:"
msgstr "ȸ»ç(_C):"
#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
msgid "_Delete"
msgstr "»èÁ¦(_D)"
@@ -586,113 +470,129 @@ msgstr "ÀÌ°ÍÀº ÀüÀÚ¿ìÆí ÁÖ¼ÒÀÔ´Ï´Ù(_T)"
msgid "Delete Contact?"
msgstr "¿¬¶ôó¸¦ »èÁ¦ÇÒ±î¿ä?"
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1193
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:628
msgid "Assistant"
msgstr "Á¶¼ö"
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:608
msgid "Business"
msgstr "Á÷Àå"
-#: addressbook/contact-editor/e-contact-editor.c:1195
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:615
msgid "Business 2"
msgstr "Á÷Àå 2"
-#: addressbook/contact-editor/e-contact-editor.c:1196
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
msgid "Business Fax"
msgstr "Á÷Àå Æѽº"
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
msgid "Callback"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1198
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:612
msgid "Car"
msgstr "ÀÚµ¿Â÷"
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
msgid "Company"
msgstr "ȸ»ç"
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:609
msgid "Home"
msgstr "Áý"
-#: addressbook/contact-editor/e-contact-editor.c:1201
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:616
msgid "Home 2"
msgstr "Áý 2"
-#: addressbook/contact-editor/e-contact-editor.c:1202
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:614
msgid "Home Fax"
msgstr "Áý Æѽº"
-#: addressbook/contact-editor/e-contact-editor.c:1203
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:617
msgid "ISDN"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1204
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:611
msgid "Mobile"
msgstr "ÈÞ´ëÀüÈ­"
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:618
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
msgid "Other"
msgstr "±âŸ"
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
msgid "Other Fax"
msgstr "±âŸ Æѽº"
-#: addressbook/contact-editor/e-contact-editor.c:1207
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:619
msgid "Pager"
msgstr "ȧȧ"
-#: addressbook/contact-editor/e-contact-editor.c:1208
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:607
msgid "Primary"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
msgid "Radio"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
msgid "Telex"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
msgid "TTY/TDD"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:620
msgid "Email 2"
msgstr "À̸ÞÀÏ 2"
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:621
msgid "Email 3"
msgstr "À̸ÞÀÏ 3"
+#: addressbook/contact-editor/e-contact-quick-add.c:215
+msgid "Contact Quick-Add"
+msgstr "¿¬¶ôó Quick Ãß°¡"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:217
+msgid "Edit Full"
+msgstr "Á¤½Ä À̸§ ÆíÁý"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:254
+msgid "Full Name"
+msgstr "Á¤½Ä À̸§"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:260
+msgid "E-mail"
+msgstr "À̸ÞÀÏ"
+
#: addressbook/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr "ÁÖ¼Ò _2:"
@@ -814,16 +714,16 @@ msgstr ""
msgid "As _Table"
msgstr ""
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:413
#, c-format
msgid "Enter password for %s"
msgstr ""
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:441
msgid "Unable to open addressbook"
msgstr "ÁÖ¼Ò·ÏÀ» ¿­¼ö°¡ ¾ø½À´Ï´Ù"
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:446
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -835,27 +735,27 @@ msgid ""
"OpenLDAP and recompile and install Evolution.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:569
msgid "Show All"
msgstr "¸ðµÎ º¸±â"
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:571
msgid "Advanced..."
msgstr "°í±Þ..."
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:601
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:602
msgid "Name contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:603
msgid "Email contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:746
msgid "The URI that the Folder Browser will display"
msgstr "Æú´õ Ž»ö±â°¡ Ç¥½ÃÇÒ URI"
@@ -880,9 +780,9 @@ msgid "None (anonymous mode)"
msgstr ""
#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-provider.c:75
#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:69
msgid "Password"
msgstr "ºñ¹Ð¹øÈ£"
@@ -923,7 +823,7 @@ msgid "Remember this password"
msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "Host:"
msgstr "È£½ºÆ®:"
@@ -952,12 +852,12 @@ msgid "Search Scope:"
msgstr "°Ë»ö ¹üÀ§:"
#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
msgid "Authentication:"
msgstr "ÀÎÁõ:"
#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
msgid "Path:"
msgstr "°æ·Î:"
@@ -984,7 +884,7 @@ msgid ""
msgstr ""
#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
msgid "Name:"
msgstr "À̸§:"
@@ -1009,21 +909,21 @@ msgstr "ÁÖ¼Ò·Ï ¼Ò½º"
#: addressbook/gui/component/addressbook-config.glade.h:3
#: calendar/gui/e-meeting-dialog.glade.h:8
#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
+#: mail/mail-config.glade.h:21 mail/mail-view.c:150
#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
msgid "Delete"
msgstr "»èÁ¦"
#: addressbook/gui/component/addressbook-config.glade.h:4
#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
msgid "Edit"
msgstr "ÆíÁý"
#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-addressbook-view.c:605
msgid "Name"
msgstr "À̸§"
@@ -1031,6 +931,24 @@ msgstr "À̸§"
msgid "URI"
msgstr ""
+#: addressbook/gui/component/e-address-widget.c:366
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:366
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:389
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr "¿¬¶ôó Á¤º¸ ÆíÁý"
+
+#: addressbook/gui/component/e-address-widget.c:425
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+msgid "Add to Contacts"
+msgstr "¿¬¶ôó¿¡ Ãß°¡"
+
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
msgid "A Bonobo control for displaying an address."
msgstr ""
@@ -1075,6 +993,16 @@ msgstr "Evolution ÁÖ¼Ò·Ï À̸§ ¼±Åà ÀÎÅÍÆäÀ̽º"
msgid "Factory for the Addressbook's name selection interface"
msgstr "ÁÖ¼Ò·Ï À̸§ ¼±Åà ÀÎÅÍÆäÀ̽º¸¦ À§ÇÑ ÆÑÅ丮"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Á¦°Å"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+msgid "Remove All"
+msgstr "ÀüºÎ Á¦°Å"
+
#: addressbook/gui/component/select-names/select-names.glade.h:1
msgid "Find..."
msgstr "ã±â..."
@@ -1203,64 +1131,64 @@ msgstr ""
msgid "z"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-minicard.c:450
msgid "Save as VCard"
msgstr "VCard·Î ÀúÀå"
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-view.c:604
msgid "* Click here to add a contact *"
msgstr "* ¿¬¶ôó¿¡ Ãß°¡Çϱâ *"
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:606
msgid "Email"
msgstr "À̸ÞÀÏ"
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:610
msgid "Organization"
msgstr "Á¶Á÷"
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:622
msgid "Web Site"
msgstr "À¥ »çÀÌÆ®"
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:623
msgid "Department"
msgstr "ºÎ¼­"
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:624
msgid "Office"
msgstr "»ç¹«½Ç"
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:625
msgid "Title"
msgstr "Á¦¸ñ"
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:626
msgid "Profession"
msgstr "Á÷¾÷"
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:627
msgid "Manager"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:629
msgid "Nickname"
msgstr "º°¸í"
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:630
msgid "Spouse"
msgstr "¹è¿ìÀÚ"
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:631
msgid "Note"
msgstr "³ëÆ®"
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:632
msgid "Free-busy URL"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:633
msgid "Click here to add a contact"
msgstr "¿¬¶ôó¿¡ Ãß°¡Çϱâ"
@@ -1268,7 +1196,7 @@ msgstr "¿¬¶ôó¿¡ Ãß°¡Çϱâ"
msgid "Save in addressbook"
msgstr "ÁÖ¼Ò·Ï¿¡ ÀúÀå"
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:145
msgid ""
"\n"
"\n"
@@ -1450,14 +1378,6 @@ msgstr "Æø:"
msgid "label26"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution ´Þ·Â ºÎÇ°"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution ´Þ·Â ºÎÇ°¿ë ¼³Á¤ µµ±¸.\n"
-
#: calendar/conduits/calendar/calendar-conduit.c:687
#: calendar/conduits/todo/todo-conduit.c:501
msgid "Error while communicating with calendar server"
@@ -1468,32 +1388,24 @@ msgstr ""
msgid "Could not read pilot's Calendar application block"
msgstr ""
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ°"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolution ÇؾßÇÒÀÏ ºÎÇ° ¼³Á¤ µµ±¸.\n"
-
#: calendar/conduits/todo/todo-conduit.c:600
#: calendar/conduits/todo/todo-conduit.c:603
msgid "Could not read pilot's ToDo application block"
msgstr ""
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:258
msgid "File not found"
msgstr "ÆÄÀÏÀÌ ¹ß°ßµÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:282
msgid "Open calendar"
msgstr "´Þ·Â ¿­±â"
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:324
msgid "Save calendar"
msgstr "´Þ·Â ÀúÀå"
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:478
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
@@ -1515,7 +1427,7 @@ msgstr ""
#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Unknown"
msgstr ""
@@ -1537,20 +1449,20 @@ msgstr "¼­"
#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:626
msgid "High"
msgstr "³ôÀÌ"
#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
#: calendar/gui/calendar-model.c:1596
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:625
msgid "Normal"
msgstr "º¸Åë"
#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:624
msgid "Low"
msgstr "³·°Ô"
@@ -1589,12 +1501,12 @@ msgid "Cancelled"
msgstr "Ãë¼ÒµÊ"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
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:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:286
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr ""
@@ -1614,10 +1526,10 @@ msgstr ""
#. An empty string is the same as 'None'.
#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:770
+#: mail/mail-account-editor.c:772 mail/mail-account-editor.c:863
#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1120
+#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1120
#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
msgid "None"
@@ -1894,12 +1806,12 @@ msgid "Overdue Items:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:52
msgid "Pick a color"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
msgid "Priority"
msgstr "¿ì¼±¼øÀ§"
@@ -2002,7 +1914,7 @@ msgid "minutes before they occur."
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
msgid "seconds."
msgstr "ÃÊ."
@@ -2264,66 +2176,77 @@ 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:271 calendar/gui/e-day-view.c:1274
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1281
#: calendar/gui/e-week-view-main-item.c:321
msgid "%A %d %B"
msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
#: calendar/gui/e-week-view-main-item.c:330
msgid "%a %d %b"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1308
#: calendar/gui/e-week-view-main-item.c:344
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
#: calendar/gui/print.c:613
msgid "am"
msgstr "¿ÀÀü"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
#: calendar/gui/print.c:612
msgid "pm"
msgstr "¿ÀÈÄ"
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
-msgid "New Appointment..."
-msgstr "»õ ¾à¼Ó..."
+#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "»õ ¾à¼Ó"
+
+#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+msgid "New All Day Event"
+msgstr ""
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+msgid "Go to Today"
+msgstr "¿À´Ã·Î À̵¿"
+
+#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+msgid "Go to Date..."
+msgstr "³¯Â¥·Î À̵¿..."
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
+#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "¿­±â"
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
msgid "Delete this Appointment"
msgstr "ÀÌ ¾à¼ÓÀ» »èÁ¦ÇÕ´Ï´Ù"
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
#: ui/evolution-event-editor.xml.h:45
msgid "Schedule Meeting"
msgstr ""
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
msgid "Make this Occurrence Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
msgid "Delete this Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3060
msgid "Delete all Occurrences"
msgstr ""
@@ -2409,7 +2332,7 @@ msgstr ""
msgid "Calendar Message"
msgstr ""
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
msgid "Date:"
msgstr "³¯Â¥:"
@@ -2421,8 +2344,7 @@ msgstr "´Þ·Â ºÒ·¯¿À±â..."
msgid "Organizer:"
msgstr "Á¶Á÷:"
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
msgid "Sender"
msgstr "º¸³½ÀÌ"
@@ -2506,8 +2428,8 @@ msgid ""
"Time"
msgstr ""
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
+#: mail/message-list.c:1014
msgid "Status"
msgstr "»óÅÂ"
@@ -2537,7 +2459,11 @@ msgstr ""
msgid "%d %B"
msgstr ""
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+msgid "New Appointment..."
+msgstr "»õ ¾à¼Ó..."
+
+#: calendar/gui/e-week-view.c:3271
msgid "Delete All Occurrences"
msgstr ""
@@ -2604,7 +2530,7 @@ msgstr "ÇÁ·Î±×·¥À» ±¸µ¿ÇÕ´Ï´Ù"
msgid "Send an email"
msgstr "À̸ÞÀÏ º¸³»±â"
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
msgid "Settings..."
msgstr "¼³Á¤..."
@@ -2629,14 +2555,12 @@ msgstr "½ÃÀÛ ½Ã°£(_S):"
msgid "_Starting date:"
msgstr "½ÃÀÛ ³¯Â¥(_S):"
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
msgid "after"
msgstr ""
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
msgid "before"
msgstr ""
@@ -3072,9 +2996,9 @@ msgstr ""
msgid "Print Calendar"
msgstr ""
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:31
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:29
msgid "Print Preview"
msgstr "Àμ⠹̸®º¸±â"
@@ -3114,12 +3038,12 @@ msgstr ""
msgid "SMTWTFS"
msgstr ""
-#: camel/camel-filter-driver.c:790
+#: camel/camel-filter-driver.c:848
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "ÇÊÅÍ ºÐ¼®Áß ¿À·ù: %s: %s"
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:853
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
@@ -3129,31 +3053,32 @@ msgstr "ÇÊÅÍ ½ÇÇàÁß ¿À·ù: %s: %s"
msgid "Error executing filter search: %s: %s"
msgstr "ÇÊÅÍ Ã£±â ½ÇÇàÁß ¿À·ù: %s: %s"
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
"%s"
msgstr ""
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
#, c-format
msgid ""
"Error executing search expression: %s:\n"
"%s"
-msgstr "ã±â¸¦ ¼öÇ൵Áß ¿À·ù: %s:\n"
+msgstr ""
+"ã±â¸¦ ¼öÇ൵Áß ¿À·ù: %s:\n"
"%s"
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
msgid "(match-all) requires a single bool result"
msgstr ""
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
#, c-format
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
msgid "Invalid type in body-contains, expecting string"
msgstr ""
@@ -3233,47 +3158,47 @@ msgstr ""
msgid "(Unknown error)"
msgstr "(¾Ë¼ö¾ø´Â ¿À·ù)"
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
#, c-format
msgid "Could not load %s: %s"
msgstr ""
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr ""
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:170
#, c-format
msgid "%s server %s"
msgstr "%s ´º½º ¼­¹ö %s"
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:174
#, c-format
msgid "%s service for %s on %s"
msgstr ""
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:221
msgid "Connection cancelled"
msgstr "¿¬°áÀÌ Ãë¼ÒµÊ"
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:243
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:225
msgid "(unknown host)"
msgstr "(¸ð¸£´Â È£½ºÆ®)"
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
+#: camel/camel-remote-store.c:439
#: camel/providers/imap/camel-imap-command.c:289
msgid "Operation cancelled"
msgstr "ÀÛ¾÷ Ãë¼Ò"
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:445
msgid "Server unexpectedly disconnected"
msgstr ""
@@ -3302,7 +3227,7 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
msgid "CRAM-MD5"
msgstr ""
@@ -3312,7 +3237,7 @@ msgid ""
"the server supports it."
msgstr ""
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
msgid "DIGEST-MD5"
msgstr ""
@@ -3362,7 +3287,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:418
msgid "Bad authentication response from server."
msgstr ""
@@ -3381,27 +3306,27 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:142
+#: camel/camel-service.c:139
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:151
+#: camel/camel-service.c:147
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:160
+#: camel/camel-service.c:155
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:512
+#: camel/camel-service.c:478
#, c-format
msgid "No such host %s."
msgstr ""
-#: camel/camel-service.c:515
+#: camel/camel-service.c:481
#, c-format
msgid "Temporarily unable to look up hostname %s."
msgstr ""
@@ -3414,17 +3339,25 @@ msgstr ""
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:323
+#: camel/camel-session.c:320
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:418
+#: camel/camel-session.c:415
#, c-format
msgid ""
"Could not create directory %s:\n"
"%s"
msgstr ""
+"%s µð·ºÅ丮¸¦ »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù:\n"
+"%s"
+
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
+#: mail/mail-ops.c:966 mail/mail-ops.c:967
+msgid "Trash"
+msgstr ""
#: camel/camel-url.c:77
#, c-format
@@ -3434,14 +3367,14 @@ msgstr ""
#: camel/camel-url.c:92
#, c-format
msgid "URL string `%s' contains an invalid protocol"
-msgstr ""
+msgstr "URL `%s'ÀÌ Á¦´ë·ÎµÈ ÇÁ·ÎÅäÄÝÀ» °¡Áö°í ÀÖÁö¾Ê½À´Ï´Ù"
#: camel/camel-url.c:152
#, c-format
msgid "Port number in URL `%s' is non-numeric"
-msgstr ""
+msgstr "URL `%s'¿¡ÀÖ´Â Æ÷Æ® ¹øÈ£°¡ ¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù"
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:962
#, c-format
msgid "No such message: %s"
msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½: %s"
@@ -3449,79 +3382,92 @@ msgstr "±×·± ¸Þ¼¼Áö ¾øÀ½: %s"
#: camel/providers/imap/camel-imap-command.c:234
#, c-format
msgid "Unexpected response from IMAP server: %s"
-msgstr ""
+msgstr "IMAP server·ÎºÎÅÍ ¿¹»óÄ¡¸øÇÑ ´äº¯: %s"
#: camel/providers/imap/camel-imap-command.c:242
#, c-format
msgid "IMAP command failed: %s"
-msgstr ""
+msgstr "IMAP ¸í·ÉÀÌ ½ÇÆÐ: %s"
#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
msgid "Unknown error"
-msgstr ""
+msgstr "¾Ë ¼ö¾ø´Â ¿¡·¯"
#: camel/providers/imap/camel-imap-command.c:297
msgid "Server response ended too soon."
-msgstr ""
+msgstr "¼­¹öÀÇ ´äº¯ÀÌ ³Ê¹« ÀÏÂï ³¡³µ½À´Ï´Ù."
#: camel/providers/imap/camel-imap-command.c:433
#, c-format
msgid "IMAP server response did not contain %s information"
-msgstr ""
+msgstr "IMAP ¼­¹öÀÇ ´äº¯¿¡ %s Á¤º¸°¡ ´ã°ÜÀÖÁö¾Ê½À´Ï´Ù"
#: camel/providers/imap/camel-imap-command.c:469
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
+msgstr "IMAP ¼­¹ö·ÎºÎÅÍ ¿¹°ßÄ¡¸øÇÑ OK´äº¯ÀÌ ¿È: %s"
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:176
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:345
msgid "Scanning IMAP folder"
msgstr "IMAP Æú´õ¸¦ »ìÆ캾´Ï´Ù"
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:946
+#: camel/providers/imap/camel-imap-folder.c:1143
+msgid "This message is not currently available"
+msgstr "ÀÌ ¸Þ½ÃÁö´Â ÇöÀç º¸¿©ÁÙ ¼ö°¡ ¾ø½À´Ï´Ù"
+
+#: camel/providers/imap/camel-imap-folder.c:976
+#: camel/providers/imap/camel-imap-folder.c:1177
msgid "Could not find message body in FETCH response."
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:40
msgid "IMAPv4"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:42
msgid "For reading and storing mail on IMAP servers."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "Secure IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:77
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:407
+#: camel/providers/imap/camel-imap-store.c:441
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:451
#, c-format
msgid "No support for authentication type %s"
msgstr "%s ŸÀÔ ÀÎÁõÀ» Áö¿ø ¾ÈÇÔ"
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:476
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:491
+#: camel/providers/smtp/camel-smtp-transport.c:374
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/smtp/camel-smtp-transport.c:382
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3529,11 +3475,15 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:871
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
+#: camel/providers/imap/camel-imap-store.c:1328
+msgid "You must be working online to complete this operation"
+msgstr ""
+
#: camel/providers/local/camel-local-provider.c:36
msgid "MH-format mail directories"
msgstr ""
@@ -3542,19 +3492,19 @@ msgstr ""
msgid "For storing local mail in MH-like mail directories"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:46
msgid "Standard Unix mailbox file"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:47
msgid "For storing local mail in standard mbox format"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:56
msgid "Qmail maildir-format mail files"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:57
msgid "For storing local mail in qmail maildir directories"
msgstr ""
@@ -3756,7 +3706,7 @@ msgid "Cannot summarise folder: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1313
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
msgid "Synchronising folder"
msgstr "Æú´õ µ¿±âÈ­"
@@ -3887,25 +3837,25 @@ msgstr ""
msgid "Unable to open or create .newsrc file for %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
msgid "Retrieving POP summary"
msgstr "POP ¿ä¾àÀ» °¡Á®¿È"
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
msgid "Could not open folder: message listing was incomplete."
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:286
#, c-format
msgid "No message with uid %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:290
#, c-format
msgid "Retrieving POP message %d"
msgstr "POP ¸Þ¼¼Áö %d¸¦ °¡Á®¿È"
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:308
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr ""
@@ -3920,71 +3870,82 @@ msgid ""
"mail from certain web mail providers and proprietary email systems."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:52
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:71
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:81
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
"claim to support it."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:93
msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "KPOP ¼­¹ö¿¡¼­ ÀÎÁõÇÒ¼ö ¾øÀ½: %s"
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:298
#, c-format
msgid "Could not connect to POP server on %s."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:337
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:356
#, c-format
msgid ""
"Unable to connect to POP server.\n"
"Error sending username: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:359
+#: camel/providers/pop3/camel-pop3-store.c:396
msgid "(Unknown)"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:386
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:394
#, c-format
msgid ""
"Unable to connect to POP server.\n"
"Error sending password: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:503
#, c-format
msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
msgid "Sendmail"
msgstr ""
@@ -4028,241 +3989,241 @@ msgstr ""
msgid "Could not find 'From' address in message"
msgstr "¸Þ¼¼Áö¿¡¼­ º¸³½ »ç¶÷À» ¾Ë¾Æ³¾¼ö°¡ ¾øÀ½"
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
msgid "sendmail"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
msgid "Mail delivery via the sendmail program"
msgstr "sendmailÀ» ÅëÇÑ ¸ÞÀÏ Àü´Þ"
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
msgid "SMTP"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:37
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:52
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:54
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:146
msgid "Syntax error, command unrecognized"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:148
msgid "Syntax error in parameters or arguments"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:150
msgid "Command not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:152
msgid "Command parameter not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:154
msgid "System status, or system help reply"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:156
msgid "Help message"
msgstr "µµ¿ò¸»"
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:158
msgid "Service ready"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:160
msgid "Service closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:162
msgid "Service not available, closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:164
msgid "Requested mail action okay, completed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:166
msgid "User not local; will forward to <forward-path>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
msgid "Requested mail action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
msgid "Requested action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
msgid "Requested action aborted: error in processing"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "User not local; please try <forward-path>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
msgid "Requested action not taken: insufficient system storage"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
msgid "Requested action not taken: mailbox name not allowed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
msgid "Transaction failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
msgid "A password transition is needed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
msgid "Authentication mechanism is too weak"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
msgid "Encryption required for requested authentication mechanism"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "Temporary authentication failure"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "Authentication required"
msgstr "ÀÎÁõÀÌ ÇÊ¿äÇÔ"
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:287
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:359
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:438
-msgid "No authentication required"
-msgstr "ÀÎÁõÀÌ ÇÊ¿äÇÏÁö ¾ÊÀ½"
-
-#: camel/providers/smtp/camel-smtp-transport.c:440
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:494
#, c-format
msgid "SMTP server %s"
msgstr "SMTP ¼­¹ö %s"
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:496
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:521
msgid "Cannot send message: sender address not defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:528
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:542
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:636
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:655
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:702
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:760
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:785
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:804
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:829
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:848
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:879
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:898
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#: camel/providers/smtp/camel-smtp-transport.c:931
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:950
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:974
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:993
#, c-format
msgid "RSET response error: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1016
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1035
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr ""
@@ -4301,11 +4262,6 @@ msgstr "÷ºÎ"
msgid "Attach a file"
msgstr "ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Á¦°Å"
-
#: composer/e-msg-composer-attachment-bar.c:461
msgid "Remove selected items from the attachment list"
msgstr "÷ºÎÆÄÀÏ ¸ñ·Ï¿¡¼­ ¼±ÅÃÇÑ Ç׸ñÀ» Á¦°ÅÇÕ´Ï´Ù"
@@ -4318,8 +4274,7 @@ msgstr "÷ºÎÆÄÀÏ Ãß°¡..."
msgid "Attach a file to the message"
msgstr "¸Þ¼¼Áö¿¡ ÆÄÀÏÀ» ÷ºÎÇÕ´Ï´Ù"
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
msgid "Attachment"
msgstr "÷ºÎ"
@@ -4350,38 +4305,45 @@ msgstr "ÁÖ¼Ò·Ï"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:696
msgid "From:"
msgstr "º¸³½ »ç¶÷:"
#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:698
+msgid "Reply-To:"
+msgstr "ȸ½Å ÁÖ¼Ò:"
+
+#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
msgid "Subject:"
msgstr "Á¦¸ñ:"
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:700
msgid "To:"
msgstr "¹Þ´Â »ç¶÷:"
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
msgid "Enter the recipients of the message"
msgstr "¸Þ¼¼Áö¸¦ ¹ÞÀ» »ç¶÷À» ÀÔ·ÂÇϼ¼¿ä"
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:702
msgid "Cc:"
msgstr "ÂüÁ¶:"
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "¸Þ¼¼ÁöÀÇ »çº»À» ¹ÞÀ» »ç¶÷ÀÇ ÁÖ¼Ò¸¦ ÀÔ·ÂÇϼ¼¿ä"
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:384
msgid "Bcc:"
msgstr "¼ûÀº ÂüÁ¶:"
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -4410,11 +4372,11 @@ msgstr "ÆÄÀÏ ÀúÀåÁß ¿À·ù ¹ß»ý: %s"
msgid "Error loading file: %s"
msgstr "ÆÄÀÏÀ» ÀдÂÁß ¿À·ù ¹ß»ý: %s"
-#: composer/e-msg-composer.c:817 shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:818 shell/e-shell-view-menu.c:193
msgid "Evolution"
msgstr ""
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
msgid ""
"This message has not been sent.\n"
"\n"
@@ -4424,27 +4386,27 @@ msgstr ""
"\n"
"º¯°æµÈ ³»¿ëÀ» ÀúÀåÇϽðڽÀ´Ï±î?"
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
msgid "Open file"
msgstr "ÆÄÀÏ ¿­±â"
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
msgid "That file does not exist."
msgstr "±× ÆÄÀÏÀº Á¸ÀçÇÏÁö¾Ê½À´Ï´Ù"
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
msgid "That is not a regular file."
msgstr "¿ä°ÅÀÌ º¸Åë ÆÄÀÏÀÌ ¾Æ´Ï³×¿ä."
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
msgid "That file exists but is not readable."
msgstr "ÆÄÀÏÀÌ ÀÖ±â´ÂÇѵ¥ ÀÐÀ» ¼ö°¡ ¾ø³×¿ä."
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
msgid "That file appeared accesible but open(2) failed."
msgstr "ÆÄÀÏÀÌ ÀÐÀ»¼ö ÀÖ´Â °Å°°±â´ÂÇѵ¥ ¿­ ¼ö°¡ ¾ø½À´Ï´Ù."
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1027
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -4452,15 +4414,15 @@ msgstr ""
"ÆÄÀÏÀÌ ¾ÆÁÖ Å©³×¿ä(100kµµ ³ÑÀ½).\n"
"»ðÀÔÇÏ°í ½ÍÀ¸½Å°Å ¸Â³ª¿ä?"
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
msgid "An error occurred while reading the file."
msgstr "ÆÄÀÏÀ» Àд µµÁß ¿¡·¯ ¹ß»ý"
-#: composer/e-msg-composer.c:1332 composer/e-msg-composer.c:1660
+#: composer/e-msg-composer.c:1354 composer/e-msg-composer.c:1686
msgid "Compose a message"
msgstr "¸ÞÀÏ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
-#: composer/e-msg-composer.c:1744
+#: composer/e-msg-composer.c:1770
msgid "Could not create composer window."
msgstr "¸Þ½ÃÁö ÀÛ¼º âÀ» ¸¸µé ¼ö°¡ ¾ø½À´Ï´Ù"
@@ -4506,7 +4468,7 @@ msgid "%H:%M%n"
msgstr ""
#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:268
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
msgid "%a %m/%d/%Y"
@@ -4514,16 +4476,40 @@ msgstr ""
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:273
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %Y/%m/%d %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:282
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %Y/%m/%d %I:%M %p"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
+#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr ""
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:314
+msgid "%H:%M:%S"
+msgstr ""
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
+#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr ""
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:322
+msgid "%I:%M:%S %p"
+msgstr ""
+
#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
msgid "Evolution component for the executive summary."
msgstr ""
@@ -4615,7 +4601,8 @@ msgstr ""
msgid ""
"Error reading data:\n"
"%s"
-msgstr "ÀÚ·áÀ» ÀдÂÁß ¿À·ù ¹ß»ý:\n"
+msgstr ""
+"ÀÚ·áÀ» ÀдÂÁß ¿À·ù ¹ß»ý:\n"
"%s"
#: executive-summary/component/e-summary.c:950
@@ -4787,29 +4774,20 @@ msgstr "ÇöÀç"
msgid "<click here to select a date>"
msgstr "<³¯Â¥¸¦ ¼±ÅÃÇÒ·Á¸é ¿©±æ ´©¸£¼¼¿ä>"
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr "°Å¸£°Ô ±ÔÄ¢À» Ãß°¡"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "°Å¸£°Ô ±ÔÄ¢À» ÆíÁý"
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "°Å¸£°Ô ÆíÁý"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "°Å¸£°³ ±ÔÄ¢"
#. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
msgid "Then"
msgstr "µ¿ÀÛ ¼±ÅÃ"
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
msgid "Add action"
msgstr "µ¿ÀÛ Ãß°¡"
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
msgid "Remove action"
msgstr "µ¿ÀÛ Á¦°Å"
@@ -4846,60 +4824,46 @@ msgstr ""
msgid "Test"
msgstr "Å×½ºÆ®"
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:598
msgid "Rule name: "
msgstr "±ÔÄ¢ À̸§: "
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:602
msgid "Untitled"
msgstr "Á¦¸ñ¾øÀ½"
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:618
msgid "If"
msgstr "Á¶°Ç ¼±ÅÃ"
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:635
msgid "Execute actions"
msgstr "µ¿ÀÛ ¼±ÅÃ"
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:639
msgid "if all criteria are met"
msgstr "¸ðµç Á¶°ÇÀÌ ´Ù ÃæÁ·µÉ ¶§"
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:644
msgid "if any criteria are met"
msgstr "¾î¶² Á¶°ÇÀÌ¶óµµ ÃæÁ·µÉ ¶§"
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:655
msgid "Add criterion"
msgstr "Á¶°Ç Ãß°¡"
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:661
msgid "Remove criterion"
msgstr "Á¶°Ç »èÁ¦"
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "ȸ½Å"
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Áß¿ä"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "ÀÐÀ½"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "°Å¸£°Ô ÆíÁý"
#: filter/filter.glade.h:5
msgid "Edit VFolders"
msgstr "°¡»óÆú´õ ÆíÁý"
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "°Å¸£°³ ±ÔÄ¢"
-
#: filter/filter.glade.h:7
msgid "Incoming"
msgstr "µé¾î¿À´Â°Å"
@@ -4908,7 +4872,7 @@ msgstr "µé¾î¿À´Â°Å"
msgid "Outgoing"
msgstr "³ª°¡´Â°Å"
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
msgid "Virtual Folders"
msgstr "°¡»ó Æú´õ"
@@ -4932,238 +4896,209 @@ msgstr ""
msgid "with all local folders"
msgstr ""
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
msgid "Assign Colour"
msgstr ""
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
msgid "Assign Score"
msgstr ""
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+msgid "Attachments"
+msgstr "÷ºÎ"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "Æ÷ÇÔ"
+
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "Æú´õ·Î º¹»ç"
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "¹ÞÀº ³¯Â¥"
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "º¸³½ ³¯Â¥"
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "»èÁ¦µÊ"
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "ÃÊ°í"
-
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
-msgstr "Ç¥Çö"
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
msgstr ""
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
-msgid "Forward to Address"
-msgstr "Àü´ÞÇÒ ÁÖ¼Ò"
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
-#: filter/libfilter-i18n.h:31
-msgid "Mailing list"
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
msgstr ""
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
-msgid "Message Body"
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
msgstr ""
-#: filter/libfilter-i18n.h:33
-msgid "Message Header"
-msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
-
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
-msgid "Message was received"
-msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
-
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
-msgid "Message was sent"
-msgstr "¸Þ¼¼Áö¸¦ º¸³Â½À´Ï´Ù"
-
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
-msgid "Move to Folder"
-msgstr "Æú´õ·Î À̵¿"
+#: filter/libfilter-i18n.h:18
+msgid "Do Not Exist"
+msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
-msgid "Recipients"
-msgstr "¹Þ´Â »ç¶÷"
+#: filter/libfilter-i18n.h:19
+msgid "Draft"
+msgstr "ÃÊ°í"
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
-msgid "Regex Match"
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
msgstr ""
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
+#: filter/libfilter-i18n.h:21
+msgid "Exist"
msgstr ""
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
-msgid "Score"
+#: filter/libfilter-i18n.h:22
+msgid "exists"
msgstr ""
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
-msgstr "Ç÷¡±× ¼³Á¤"
+#: filter/libfilter-i18n.h:23
+msgid "Expression"
+msgstr "Ç¥Çö"
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
-msgstr "»óÅ ¼³Á¤"
+#: filter/libfilter-i18n.h:24
+msgid "Forward to Address"
+msgstr "Àü´ÞÇÒ ÁÖ¼Ò"
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
-msgid "Source"
-msgstr ""
+#: filter/libfilter-i18n.h:25
+msgid "Important"
+msgstr "Áß¿ä"
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
-msgid "Specific header"
+#: filter/libfilter-i18n.h:26
+msgid "is"
msgstr ""
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
-msgid "Stop Processing"
+#: filter/libfilter-i18n.h:27
+msgid "is greater than"
msgstr ""
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
-msgid "Subject"
-msgstr "Á¦¸ñ"
+#: filter/libfilter-i18n.h:28
+msgid "is less than"
+msgstr ""
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "Æ÷ÇÔ"
+#: filter/libfilter-i18n.h:29
+msgid "is not"
+msgstr ""
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "Æ÷ÇÔÇÏÁö¾ÊÀ½"
+#: filter/libfilter-i18n.h:30
+msgid "Mailing list"
+msgstr ""
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
+#: filter/libfilter-i18n.h:31
+msgid "Message Body"
msgstr ""
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr "Á¸ÀçÇÏÁö ¾ÊÀ½"
+#: filter/libfilter-i18n.h:32
+msgid "Message Header"
+msgstr "¸Þ¼¼Áö ¸Ó¸®¸»"
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr ""
+#: filter/libfilter-i18n.h:33
+msgid "Message was received"
+msgstr "¸Þ¼¼Áö¸¦ ¹Þ¾Ò½À´Ï´Ù"
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr ""
+#: filter/libfilter-i18n.h:34
+msgid "Message was sent"
+msgstr "¸Þ¼¼Áö¸¦ º¸³Â½À´Ï´Ù"
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr ""
+#: filter/libfilter-i18n.h:35
+msgid "Move to Folder"
+msgstr "Æú´õ·Î À̵¿"
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
+#: filter/libfilter-i18n.h:36
+msgid "on or after"
msgstr ""
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
+#: filter/libfilter-i18n.h:37
+msgid "on or before"
msgstr ""
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr ""
+#: filter/libfilter-i18n.h:38
+msgid "Read"
+msgstr "ÀÐÀ½"
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr ""
+#: filter/libfilter-i18n.h:39
+msgid "Recipients"
+msgstr "¹Þ´Â »ç¶÷"
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
+#: filter/libfilter-i18n.h:40
+msgid "Regex Match"
msgstr ""
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
+#: filter/libfilter-i18n.h:41
+msgid "Replied to"
+msgstr "ȸ½Å"
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1014
+msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr ""
+#: filter/libfilter-i18n.h:44
+msgid "Set Status"
+msgstr "»óÅ ¼³Á¤"
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
+#: filter/libfilter-i18n.h:45
msgid "sounds like"
msgstr ""
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
+#: filter/libfilter-i18n.h:46
+msgid "Specific header"
msgstr ""
-#: filter/libfilter-i18n.h:158
-msgid "was after"
+#: filter/libfilter-i18n.h:47
+msgid "starts with"
msgstr ""
-#: filter/libfilter-i18n.h:159
-msgid "was before"
+#: filter/libfilter-i18n.h:49
+msgid "Stop Processing"
msgstr ""
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr ""
+#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+msgid "Subject"
+msgstr "Á¦¸ñ"
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/libfilter-i18n.h:51
+msgid "was after"
msgstr ""
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
+#: filter/libfilter-i18n.h:52
+msgid "was before"
msgstr ""
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: filter/score-editor.c:126
+msgid "Score Rules"
msgstr ""
-#: mail/component-factory.c:303
+#: mail/component-factory.c:319
msgid "Cannot initialize Evolution's mail component."
msgstr ""
-#: mail/component-factory.c:376
+#: mail/component-factory.c:392
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser-factory.c:213
+#: mail/folder-browser-factory.c:244
#, c-format
msgid "Properties for \"%s\""
msgstr "\"%s\"¿¡´ëÇÑ ¼³Á¤"
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
#: ui/evolution-task-editor-dialog.xml.h:42
msgid "Properties"
msgstr "¼³Á¤"
@@ -5172,81 +5107,85 @@ msgstr "¼³Á¤"
msgid "Store search as vFolder"
msgstr "°¡»ó Æú´õ·Î ã±â¸¦ ÀúÀå"
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:510
msgid "VFolder on Subject"
msgstr ""
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:513
msgid "VFolder on Sender"
msgstr ""
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:516
msgid "VFolder on Recipients"
msgstr ""
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:519 mail/folder-browser.c:710
msgid "VFolder on Mailing List"
msgstr ""
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:525
msgid "Filter on Subject"
msgstr ""
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:528
msgid "Filter on Sender"
msgstr ""
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:531
msgid "Filter on Recipients"
msgstr ""
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:534 mail/folder-browser.c:709
msgid "Filter on Mailing List"
msgstr "¸ÞÀϸµ ¸®½ºÆ®¿¡´ëÇÑ ÇÊÅÍ"
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:545
+msgid "Resend"
+msgstr "´Ù½Ã º¸³¿"
+
+#: mail/folder-browser.c:547
msgid "Save As..."
msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..."
-#: mail/folder-browser.c:545 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:30 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:549 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
msgid "Print"
msgstr "Àμâ"
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:554
msgid "Reply to Sender"
msgstr "º¸³½ »ç¶÷¿¡°Ô ȸ½Å"
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
msgid "Reply to All"
msgstr "Àüü ȸ½Å"
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
msgid "Forward"
msgstr "Àü´Þ"
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:560
msgid "Forward inline"
msgstr ""
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:563
msgid "Mark as Read"
msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã"
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:565
msgid "Mark as Unread"
msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã"
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:570
msgid "Move to Folder..."
msgstr "Æú´õ·Î À̵¿..."
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:572
msgid "Copy to Folder..."
msgstr "Æú´õ·Î º¹»ç..."
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:576
msgid "Undelete"
msgstr "µÇ»ì¸²"
@@ -5254,20 +5193,20 @@ msgstr "µÇ»ì¸²"
#. GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
#. { "", NULL,
#. GTK_SIGNAL_FUNC (NULL), NULL, 0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:586
msgid "Apply Filters"
msgstr "°Å¸£°³ Àû¿ë"
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:590
msgid "Create Rule From Message"
msgstr ""
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:712
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:713
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr ""
@@ -5304,22 +5243,6 @@ msgstr ""
msgid "Factory for the Mail Summary component."
msgstr ""
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
#: mail/local-config.glade.h:1
msgid "Current store format:"
msgstr "ÇöÀç ÀúÀå Æ÷¸ä:"
@@ -5364,22 +5287,22 @@ msgid "Are you sure you want to delete this news account?"
msgstr "Á¤¸»·Î ÀÌ »õ °èÁ¤À» Áö¿ì±â¸¦ ¿øÇϽʴϱî?"
#. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:452
msgid "Evolution Account Manager"
msgstr ""
-#: mail/mail-account-editor.c:307
+#: mail/mail-account-editor.c:301
msgid ""
"One or more of your servers are not configured correctly.\n"
"Do you wish to save anyway?"
msgstr ""
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:706
+#: mail/mail-account-editor.c:720
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-editor.c:727
+#: mail/mail-account-editor.c:741
msgid "Unspecified"
msgstr ""
@@ -5403,6 +5326,10 @@ msgstr ""
msgid "%s mailing list"
msgstr ""
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "°Å¸£°Ô ±ÔÄ¢À» Ãß°¡"
+
#: mail/mail-callbacks.c:85
msgid ""
"You have not configured the mail client.\n"
@@ -5433,103 +5360,113 @@ msgid ""
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:296
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:316
+#: mail/mail-callbacks.c:318
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:583
#, c-format
msgid "On %s, %s wrote:\n"
msgstr ""
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:765
msgid "Forwarded message:\n"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö:\n"
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:868
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:870
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1011
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1048
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:1081 mail/mail-display.c:83
msgid "Overwrite file?"
msgstr ""
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1085 mail/mail-display.c:87
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1129
msgid "Save Message As..."
msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1131
msgid "Save Messages As..."
msgstr "´Ù¸¥À̸§À¸·Î ¸Þ¼¼Áö ÀúÀå..."
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1245
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1294
msgid "Print Message"
msgstr "¸Þ¼¼Áö Àμâ"
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1341
msgid "Printing of message failed"
msgstr "¸Þ¼¼Áö ÀμâÁß ½ÇÆÐ"
#: mail/mail-config.glade.h:1
+msgid " color"
+msgstr "»ö»ó"
+
+#: mail/mail-config.glade.h:2
msgid "Account"
msgstr "°èÁ¤"
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
msgid "Account Information"
msgstr "°èÁ¤ Á¤º¸"
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "Account Management"
msgstr "°èÁ¤ °ü¸®"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
msgid "Advanced"
msgstr "°í±Þ"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
msgid "Authentication"
msgstr "ÀÎÁõ:"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
msgid "Authentication Type:"
msgstr "ÀÎÁõ Á¾·ù:"
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
msgid "Automatically check mail every"
msgstr ""
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
msgid "Check settings"
msgstr ""
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -5539,212 +5476,214 @@ msgid ""
"Click \"Finish\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:20
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
msgid "Done"
msgstr "¿Ï·á"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
msgid "Email Address:"
msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
msgid "Email address:"
msgstr "ÀüÀÚ¿ìÆí ÁÖ¼Ò:"
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
msgid "Evolution Mail Configuration"
msgstr "¸ÞÀÏ ¼³Á¤"
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
msgid "Full Name:"
msgstr "ÀüüÀ̸§:"
#: mail/mail-config.glade.h:29
+msgid "Highlight citations with "
+msgstr ""
+
+#: mail/mail-config.glade.h:31
msgid "Hostname:"
msgstr "È£½ºÆ®:"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "IMAP"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
msgid "Identity"
msgstr ""
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
msgid "Include this account when receiving mail"
msgstr ""
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
msgid "Keep mail on server"
msgstr "¼­¹ö¿¡ ¸ÞÀÏ ³²±â±â"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
msgid "Kerberos"
msgstr ""
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
msgid "Mail"
msgstr "ÆíÁö"
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
msgid "Mail Account"
msgstr ""
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
msgid "Mail Configuration"
msgstr "¸ÞÀÏ ¼³Á¤"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
msgid "Mail Configuration Druid"
msgstr "¸ÞÀÏ ¼³Á¤ Druid"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
msgid "Make this my default account"
msgstr "±âº» °èÁ¤À¸·Î Çϱâ"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
msgid "Mark messages as \"Read\" after:"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
msgid "News"
msgstr "´º½º"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Optional"
msgstr ""
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
msgid "Organization:"
msgstr "Á¶Á÷:"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
msgid "PGP binary path:"
msgstr "PGP °æ·Î"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "Password:"
msgstr "ºñ¹Ð¹øÈ£:"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:53
msgid "Plain Text"
msgstr ""
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:54
msgid "Receiving Email"
msgstr "ÆíÁö¸¦ ¹ÞÀ½"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
msgid "Remember my password"
msgstr "ÀÌ ºñ¹Ð¹øÈ£ ±â¾ï"
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:56
msgid "Reply address:"
msgstr "ȸ½Å ÁÖ¼Ò:"
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:57
msgid "Required"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
msgid "Save password"
msgstr "¾ÏÈ£ ÀúÀå"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
msgid "Select PGP binary"
msgstr "PGP ÇÁ·Î±×·¥ ÆÄÀÏÀ» ¼±ÅÃ"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
msgid "Select signature file"
msgstr "¼­¸í ÆÄÀÏÀ» °í¸£¼¼¿ä"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
msgid "Send mail in HTML format by default."
msgstr "±âº»À¸·Î ÆíÁö¸¦ HTMLÇü½ÄÀ¸·Î º¸³¿"
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
msgid "Sending Email"
msgstr "ÆíÁö¸¦ º¸³¿"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
msgid "Server Configuration"
msgstr "¼­¹ö ¼³Á¤"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
msgid "Server Type: "
msgstr "¼­¹ö Á¾·ù: "
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
msgid "Server requires authentication"
msgstr "¼­¹ö°¡ ÀÎÁõÀ» ¿ä±¸ÇÕ´Ï´Ù"
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:68
msgid "Server type:"
msgstr "¼­¹ö Á¾·ù::"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
msgid "Signature file:"
msgstr "¼­¸í ÆÄÀÏ:"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
msgid "Signature:"
msgstr "¼­¸í:"
-#: mail/mail-config.glade.h:69
-msgid "Sources"
+#: mail/mail-config.glade.h:71
+msgid "Source"
msgstr ""
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "ÀÌ ¼­¹ö´Â SSL¸¦ ¿ä±¸ÇÕ´Ï´Ù"
+#: mail/mail-config.glade.h:72
+msgid "Sources"
+msgstr ""
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
msgid "Transport"
msgstr ""
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
msgid "Transport Authentication"
msgstr ""
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
msgid "Type"
msgstr ""
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
msgid ""
"Type the name by which you would like to refer to these servers. For "
"example: \"Work\" or \"Home\"."
-msgstr ""
-"ÀÌ ¼­¹ö¸¦ °¡¸£Å³ À̸§À» ÁöÁ¤Çϼ¼¿ä."
-"°¡·É \"Á÷Àå\"À̳ª ¶Ç´Â \"Áý\"."
+msgstr "ÀÌ ¼­¹ö¸¦ °¡¸£Å³ À̸§À» ÁöÁ¤Çϼ¼¿ä.°¡·É \"Á÷Àå\"À̳ª ¶Ç´Â \"Áý\"."
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
msgid "User Information"
msgstr "»ç¿ëÀÚ Á¤º¸"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
msgid "Username:"
msgstr "»ç¿ëÀÚÀ̸§:"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
msgid ""
"Welcome to the Evolution Mail Configuration Druid.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
msgid "_Edit"
msgstr "¼öÁ¤(_E)"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "minutes."
msgstr "ºÐ"
@@ -5811,55 +5750,51 @@ msgstr "¼û±è"
msgid "%s attachment"
msgstr "%s ÷ºÎ"
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr "´ä½Å ÁÖ¼Ò:"
-
-#: mail/mail-format.c:704
+#: mail/mail-format.c:723
msgid "Loading message content"
msgstr "¸Þ½ÃÁö ³»¿ëÀ» Àоîµå¸²"
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1012
msgid "Encrypted message not displayed"
msgstr "¾ÏȣȭµÈ ¸Þ½ÃÁö´Â º¸ÀÌÁö¾ÊÀ½"
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1018
msgid "Encrypted message"
msgstr "¾ÏȣȭµÈ ¸Þ¼¼Áö"
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1019
msgid "Click icon to decrypt."
msgstr ""
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1088 mail/mail-format.c:1475
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1096 mail/mail-format.c:1483
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1696
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1708
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1712
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1746
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1751
msgid "Malformed external-body part."
msgstr ""
@@ -5917,14 +5852,14 @@ msgid ""
"you may need to repair it manually."
msgstr ""
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:181
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:183
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -5933,96 +5868,96 @@ msgstr ""
"ÀÛ¾÷ ¼öÇàÁß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:\n"
"%s"
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
msgid "Working"
msgstr ""
-#: mail/mail-mt.c:666
+#: mail/mail-mt.c:670 mail/session.c:91
msgid "Do you accept?"
msgstr "¹Þ¾ÆµéÀÌ°Ú½À´Ï±î?"
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:864
msgid "Evolution progress"
msgstr ""
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:518
#, c-format
msgid "Sending \"%s\""
msgstr "\"%s\" º¸³»´Â Áß"
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:520
msgid "Sending message"
msgstr "¸Þ¼¼Áö¸¦ º¸³¿"
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:751
msgid "Saving message to folder"
msgstr "¸Þ¼¼Áö¸¦ Æú´õ·Î ÀúÀå"
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:824
#, c-format
msgid "Moving messages to %s"
msgstr "¸Þ½ÃÁöµéÀ» %s·Î À̵¿"
-#: mail/mail-ops.c:821
+#: mail/mail-ops.c:824
#, c-format
msgid "Copying messages to %s"
msgstr "¸Þ½ÃÁöµéÀ» %s·Î º¹»ç"
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:841
msgid "Moving"
msgstr "À̵¿Áß"
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:844
msgid "Copying"
msgstr "º¹»çÁß"
-#: mail/mail-ops.c:852
+#: mail/mail-ops.c:855
#, c-format
msgid "%s message %d of %d (uid \"%s\")"
msgstr ""
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:926
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1070
+#: mail/mail-ops.c:1084
msgid "Forwarded messages"
msgstr "Àü´ÞµÈ ¸Þ½ÃÁö"
-#: mail/mail-ops.c:1111 mail/mail-ops.c:1249
+#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
#, c-format
msgid "Opening folder %s"
msgstr "%s Æú´õ¸¦ ¿­±â"
-#: mail/mail-ops.c:1178
+#: mail/mail-ops.c:1192
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1379
msgid "Expunging folder"
msgstr "Æú´õ ºñ¿ì±â"
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1428
#, c-format
msgid "Retrieving message %s"
msgstr "¸Þ¼¼Áö %s¸¦ °¡Á®¿À±â"
-#: mail/mail-ops.c:1481
+#: mail/mail-ops.c:1495
msgid "Retrieving messages"
msgstr "¸Þ¼¼ÁöµéÀ» °¡Á®¿À±â"
-#: mail/mail-ops.c:1491
+#: mail/mail-ops.c:1505
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr ""
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1579
msgid "Saving messages"
msgstr "¸Þ½ÃÁöµéÀ» ÀúÀå"
-#: mail/mail-ops.c:1644
+#: mail/mail-ops.c:1658
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6031,12 +5966,12 @@ msgstr ""
"Ãâ·ÂÆÄÀÏÀ» »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù: %s\n"
" %s"
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1671
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "%2$dÁß %1$d¸Þ½ÃÁö ÀúÀå (uid \"%3$s\")"
-#: mail/mail-ops.c:1671
+#: mail/mail-ops.c:1685
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6045,19 +5980,20 @@ msgstr ""
"%s·Î ¸Þ½ÃÁö ÀúÀåÁß ¿À·ù ¹ß»ý:\n"
" %s"
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1759
msgid "Saving attachment"
msgstr "÷ºÎ ÀúÀå"
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1774
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
-msgstr "Ãâ·Â ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s:\n"
+msgstr ""
+"Ãâ·Â ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s:\n"
" %s"
-#: mail/mail-ops.c:1788
+#: mail/mail-ops.c:1802
#, c-format
msgid "Could not write data: %s"
msgstr "µ¥ÀÌŸ¸¦ ¾µ ¼ö°¡ ¾ø½À´Ï´Ù: %s"
@@ -6131,7 +6067,7 @@ msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
"%s<br><b>Subject:</b> %s<br>"
msgstr ""
-"-----Àü´Þ ¸Þ½ÃÁö-----<br><b>º¸³½ÀÌ:</b> %s<br><b>¹Þ´ÂÀÌ:</b> "
+"-----Àü´Þ ¸Þ½ÃÁö-----<br><b>º¸³½ »ç¶÷:</b> %s<br><b>¹Þ´Â »ç¶÷:</b> "
"%s<br><b>Á¦¸ñ:</b> %s<br>"
#: mail/mail-vfolder.c:248
@@ -6144,15 +6080,15 @@ msgstr "»õ °¡»óÆú´õ"
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
msgid "Reply"
msgstr "ȸ½Å"
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
msgid "Reply to the sender of this message"
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ º¸³½»ç¶÷¿¡°Ô ȸ½ÅÀ» ÇÕ´Ï´Ù"
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
msgid "Reply to all recipients of this message"
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ¹ÞÀº ¸ðµç »ç¶÷¿¡°Ô ȸ½ÅÀ» ÇÕ´Ï´Ù"
@@ -6160,82 +6096,95 @@ msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ¹ÞÀº ¸ðµç »ç¶÷¿¡°Ô ȸ½ÅÀ» ÇÕ´Ï´Ù"
msgid "Forward this message"
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù¸¥»ç¶÷¿¡°Ô Àü´ÞÇÕ´Ï´Ù"
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
msgid "Print the selected message"
msgstr "¼±ÅÃÇÑ ¸Þ¼¼Áö¸¦ ÀμâÇÕ´Ï´Ù"
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
msgid "Delete this message"
msgstr "ÀÌ ¸Þ¼¼Áö¸¦ »èÁ¦ÇÕ´Ï´Ù"
-#: mail/message-list.c:618
+#: mail/message-list.c:614
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:627
+#: mail/message-list.c:615
+msgid "Seen"
+msgstr ""
+
+#: mail/message-list.c:616
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:617
msgid "Multiple Unseen Messages"
msgstr "¿©·¯°³ÀÇ º¸Áö¾ÊÀº ¸Þ¼¼Áö"
-#: mail/message-list.c:630
+#: mail/message-list.c:618
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
+#: mail/message-list.c:622
+msgid "Lowest"
msgstr ""
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s µîµî."
+#: mail/message-list.c:623
+msgid "Lower"
+msgstr ""
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<´©±¼±î>"
+#: mail/message-list.c:627
+msgid "Higher"
+msgstr ""
-#: mail/message-list.c:1035
+#: mail/message-list.c:628
+msgid "Highest"
+msgstr ""
+
+#: mail/message-list.c:878
msgid "?"
msgstr ""
-#: mail/message-list.c:1042
+#: mail/message-list.c:885
msgid "Today %l:%M %p"
msgstr "¿À´Ã %l:%M %p"
-#: mail/message-list.c:1051
+#: mail/message-list.c:894
msgid "Yesterday %l:%M %p"
msgstr "¾îÁ¦ %l:%M %p"
-#: mail/message-list.c:1063
+#: mail/message-list.c:906
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1071
+#: mail/message-list.c:914
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1073
+#: mail/message-list.c:916
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:1172
+#: mail/message-list.c:1014
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1015
msgid "From"
msgstr "º¸³½ÀÌ"
-#: mail/message-list.c:1172
+#: mail/message-list.c:1015
msgid "Date"
msgstr "³¯Â¥"
-#: mail/message-list.c:1172
+#: mail/message-list.c:1015
msgid "Received"
msgstr "¹Þ¾ÒÀ½"
-#: mail/message-list.c:1173
+#: mail/message-list.c:1016
msgid "To"
msgstr "¹Þ´Â»ç¶÷"
-#: mail/message-list.c:1173
+#: mail/message-list.c:1016
msgid "Size"
msgstr "Å©±â"
@@ -6274,29 +6223,29 @@ msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö¾ÊÀ½"
msgid "Couldn't create temp file: %s"
msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé¼ö ¾øÀ½: %s"
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
msgid "Folder"
msgstr "Æú´õ"
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:74
msgid "Store"
msgstr ""
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:156
msgid "Display folders starting with:"
msgstr ""
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:186
#, c-format
msgid "Getting store for \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:289
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:291
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr ""
@@ -6454,8 +6403,7 @@ msgid ""
"Error: %s"
msgstr ""
"%s µð·ºÅ丮¸¦\n"
-"»ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
-"¿¡·¯: %s"
+"»ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù¿¡·¯: %s"
#: shell/e-setup.c:224
#, c-format
@@ -6513,19 +6461,19 @@ msgstr "»õ·Î¿î..."
msgid "(Untitled)"
msgstr "(Á¦¸ñ¾øÀ½)"
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:160
msgid "Bug buddy was not found in your $PATH."
msgstr "½Ã½ºÅÛÀÇ °æ·Î¿¡ Bug buddy¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù."
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:166
msgid "Bug buddy could not be run."
msgstr "Bug buddy¸¦ ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù."
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:195
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr ""
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:197
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -6535,7 +6483,7 @@ msgstr ""
"ÀÏÁ¤, ¿¬¶ôó °ü¸®¸¦ ÇÏ´Â ±×·ì¿þ¾î ÀÀ¿ëÇÁ·Î±×·¥\n"
"¸ðÀ½ ÀÔ´Ï´Ù."
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:361
msgid "Go to folder..."
msgstr "Æú´õ À̵¿..."
@@ -6562,7 +6510,7 @@ msgstr ""
msgid "Cannot set up local storage -- %s"
msgstr "½Ã½ºÅÛ ÀúÀåÀåÄ¡¸¦ ÁöÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù -- %s"
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
#, c-format
msgid ""
"Ooops! The view for `%s' have died unexpectedly. :-(\n"
@@ -6648,13 +6596,13 @@ msgstr ""
msgid "Error saving shortcuts."
msgstr ""
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+#: shell/e-storage-set-view.c:617 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
msgid "_View"
msgstr "º¸±â(_V)"
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:617
msgid "View the selected folder"
msgstr "¼±ÅÃµÈ Æú´õ º¸±â"
@@ -6710,8 +6658,8 @@ msgstr "ÀÌ ÀúÀå¸Åü¿¡ ÁöÁ¤µÈ Çü½ÄÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
msgid "The Evolution shell."
msgstr "Evolution ½©."
-#: shell/main.c:75
-#, c-format
+#: shell/main.c:74
+#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this PREVIEW RELEASE\n"
"of the Evolution groupware suite.\n"
@@ -6731,7 +6679,7 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:100
+#: shell/main.c:99
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -6739,15 +6687,15 @@ msgstr ""
"°¨»çÇÕ´Ï´Ù\n"
"Evolution ÆÀ\n"
-#: shell/main.c:131
+#: shell/main.c:130
msgid "Cannot initialize the Evolution shell."
msgstr "Evolution ½©À» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
-#: shell/main.c:177
+#: shell/main.c:176
msgid "Disable."
msgstr ""
-#: shell/main.c:197
+#: shell/main.c:196
msgid "Cannot initialize the Bonobo component system."
msgstr "º¸³ëº¸ ÄÄÆ÷³ÍÆ® ½Ã½ºÅÛÀ» ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù."
@@ -6771,8 +6719,8 @@ msgstr "¿¬¶ôó ã¾Æº»´Ù"
msgid "New contact"
msgstr "»õ ¿¬¶ôó"
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
+#: ui/evolution-mail.xml.h:27
msgid "Previews the message to be printed"
msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
@@ -6780,7 +6728,7 @@ msgstr "ÀμâµÉ ¸Þ½ÃÁö¸¦ ¹Ì¸®º¾´Ï´Ù"
msgid "Print contacts"
msgstr "¿¬¶ôó¸¦ ÀμâÇÕ´Ï´Ù"
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
msgid "Stop"
msgstr "ÁßÁö"
@@ -6804,7 +6752,7 @@ msgstr ""
msgid "_Contact"
msgstr "¿¬¶ôó(_C)"
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
#: ui/evolution-contact-editor.xml.h:15
msgid "_Print..."
msgstr "Àμâ(_P)..."
@@ -6813,9 +6761,9 @@ msgstr "Àμâ(_P)..."
msgid "_Search for contacts"
msgstr "¿¬¶ôó ã±â(_S)"
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:75
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:77
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
msgid "_Tools"
msgstr "µµ±¸(_T)"
@@ -6828,117 +6776,145 @@ msgid "Alter preferences"
msgstr "¼³Á¤À» º¯°æÇÕ´Ï´Ù"
#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:5
msgid "Create a new appointment"
msgstr "»õ·Î¿î ¾à¼Ó¸¦ ¸¸µç´Ù"
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
msgid "Create a new calendar"
msgstr "»õ ´Þ·ÂÀ» ¸¸µì´Ï´Ù"
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
msgid "Day"
msgstr ""
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
msgid "Go To"
msgstr "°¡±â"
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
msgid "Go back in time"
-msgstr ""
+msgstr "½Ã°£»óÀ¸·Î µÚ·Î °¡±â"
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
msgid "Go forward in time"
-msgstr ""
+msgstr "½Ã°£»óÀ¸·Î ¾ÕÀ¸·Î °¡±â"
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
+msgstr "³¯Â¥·Î À̵¿(_D)"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
+msgstr "¿À´Ã·Î À̵¿(_T)"
+
+#: ui/evolution-calendar.xml.h:13
msgid "Go to a specific date"
msgstr "ÁöÁ¤ÇÑ ³¯·Î °¡±â"
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
msgid "Go to present time"
msgstr "ÇöÀç ½Ã°£À¸·Î À̵¿"
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
msgid "Month"
msgstr "´Þ"
-#: ui/evolution-calendar.xml.h:13
-msgid "New Appointment"
-msgstr "»õ ¾à¼Ó"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr ""
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
#: ui/evolution-task-editor-dialog.xml.h:32
msgid "Next"
msgstr "´ÙÀ½"
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
msgid "Open Calendar"
msgstr "´Þ·Â ¿­±â"
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
msgid "Prev"
msgstr "ÀÌÀü"
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:25
msgid "Print calendar"
msgstr "´Þ·Â ÀμâÇϱâ"
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
msgid "Print this Calendar"
msgstr "ÇöÀçÀÇ ´Þ·ÂÀ» ÀμâÇÕ´Ï´Ù"
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
msgid "Save As"
msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå"
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
msgid "Save calendar as something else"
msgstr "´Þ·ÂÀ» ´Ù¸¥ °ÍÀ¸·Î ÀúÀåÇÕ´Ï´Ù"
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
msgid "Show 1 day"
msgstr "ÇϷ羿 º¸±â"
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
msgid "Show 1 month"
msgstr "ÇÑ´Þ¾¿ º¸±â"
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
msgid "Show 1 week"
msgstr "ÇÑÁÖ¾¿ º¸±â"
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
msgid "Show the working week"
msgstr ""
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
#: widgets/misc/e-dateedit.c:413
msgid "Today"
msgstr "¿À´Ã"
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36
msgid "Week"
msgstr "ÁÖ"
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
msgid "_Appointment"
msgstr "¾à¼Ó(_A)"
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:39
+msgid "_Month"
+msgstr "´Þ(_M)"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
msgid "_New"
msgstr "»õ·Î¿î(_N)"
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
msgid "_Open Calendar"
msgstr "´Þ·Â ¿­±â(_O)"
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:72
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
#: ui/evolution-tasks.xml.h:8
msgid "_Save As..."
msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå(_S)..."
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
+msgstr "ÁÖ(_W)"
+
#: ui/evolution-contact-editor.xml.h:2
msgid "Delete this item"
msgstr "ÀÌ Ç׸ñ¸¦ »èÁ¦ÇÕ´Ï´Ù"
@@ -6961,7 +6937,7 @@ msgid "Print this item"
msgstr "ÀÌ Ç׸ñÀ» Àμâ"
#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:34 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
msgid "Print..."
msgstr "Àμâ..."
@@ -6993,13 +6969,13 @@ msgid "Send _message to contact..."
msgstr ""
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
msgid "_File"
msgstr "ÆÄÀÏ(_F)"
#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
#: ui/evolution-task-editor-dialog.xml.h:85
msgid "_Save"
msgstr "ÀúÀå(_S)"
@@ -7048,7 +7024,7 @@ msgstr "ÀÌ ¾à¼ÓÀ» ´Ý½À´Ï´Ù"
msgid "Cop_y to Folder... (FIXME)"
msgstr "Æú´õ·Î º¹»ç..."
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
#: ui/evolution-task-editor-dialog.xml.h:14
msgid "Copy"
msgstr "º¹»ç"
@@ -7138,7 +7114,7 @@ msgid "Print Setup"
msgstr "Àμ⠼³Á¤"
#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
msgid "Save"
msgstr "ÀúÀå"
@@ -7175,18 +7151,18 @@ msgstr ""
msgid "Task _Request (FIXME)"
msgstr ""
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
#: ui/evolution-task-editor-dialog.xml.h:63
msgid "_About..."
msgstr "ÀÌ ÇÁ·Î±×·¥Àº(_A)..."
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
msgid "_Close"
msgstr "´Ý±â(_C)"
#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
msgid "_Contact (FIXME)"
msgstr "¿¬°á(_C) (°íÄ¥¿¹Á¤)"
@@ -7194,13 +7170,13 @@ msgstr "¿¬°á(_C) (°íÄ¥¿¹Á¤)"
msgid "_Copy"
msgstr "º¹»ç(_C)"
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
#: ui/evolution-task-editor-dialog.xml.h:68
msgid "_Debug"
msgstr "µð¹ö±ë(_D)"
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
msgid "_Help"
msgstr "µµ¿ò¸»(_H)"
@@ -7237,7 +7213,7 @@ msgstr "ºÙÀ̱â(_P)"
msgid "_Print"
msgstr "Àμâ(_P)"
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
#: ui/evolution-task-editor-dialog.xml.h:83
msgid "_Properties..."
msgstr "¼³Á¤(_P)..."
@@ -7247,7 +7223,7 @@ msgid "_Select All"
msgstr "ÀüºÎ ¼±ÅÃ(_S)"
#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
msgid "_Task (FIXME)"
msgstr "ÀÛ¾÷(_T) (°íÄ¥¿¹Á¤)"
@@ -7275,26 +7251,30 @@ msgstr ""
msgid "New Mail"
msgstr "»õ ÆíÁö"
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:1
msgid "Compose"
msgstr "ÆíÁö ÀÛ¼º"
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:2
msgid "Compose a new message"
msgstr "»õ ¸Þ¼¼Áö¸¦ ÀÛ¼ºÇÕ´Ï´Ù"
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:4
msgid "Copy message to a new folder"
msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î º¹»çÇÕ´Ï´Ù"
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:5
msgid "Create _Virtual Folder From Message"
msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °¡»ó Æú´õ »ý¼º(_V)"
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:8
msgid "Display all of the message headers"
msgstr "¸ðµç ¸Þ½ÃÁö Çì´õ º¸À̱â"
+#: ui/evolution-mail.xml.h:9
+msgid "Empty _Trash"
+msgstr ""
+
#: ui/evolution-mail.xml.h:10
msgid "Filter on Se_nder"
msgstr "¹ß¼ÛÀο¡´ëÇÑ °Å¸£°Ô(_n)"
@@ -7316,8 +7296,8 @@ msgid "Forward As"
msgstr "´Ù¸¥ ÁÖ¼Ò·Î Àü´Þ"
#: ui/evolution-mail.xml.h:17
-msgid "Full Headers"
-msgstr "Çì´õ ÀüºÎ º¸±â"
+msgid "Full _Headers"
+msgstr "¸ðµç Çì´õ º¸±â(_H)"
#: ui/evolution-mail.xml.h:18
msgid "Hide S_elected Messages"
@@ -7332,137 +7312,137 @@ msgid "Hide _Read messages"
msgstr "ÀÐÀº ¸Þ¼¼Áö ¼û±è(_R)"
#: ui/evolution-mail.xml.h:21
-msgid "Inline"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:22
msgid "Manage _Subscriptions..."
msgstr "±¸µ¶ °ü¸®(_S)..."
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:22
msgid "Mar_k as Read"
msgstr "ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_k)"
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:23
msgid "Mark All as R_ead"
msgstr "ÀüºÎ¸¦ ÀÐÀº °ÍÀ¸·Î Ç¥½Ã(_e)"
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:24
msgid "Mark as U_nread"
msgstr "ÀÐÁö ¾ÊÀº °ÍÀ¸·Î Ç¥½Ã(_n)"
-#: ui/evolution-mail.xml.h:26
-msgid "Message _Display"
-msgstr "¸Þ½ÃÁö Ç¥½Ã(_D)"
-
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:25
msgid "Move"
msgstr "À̵¿"
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:26
msgid "Move message to a new folder"
msgstr "¸Þ¼¼Áö¸¦ »õ Æú´õ·Î À̵¿ÇÕ´Ï´Ù"
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:30
msgid "Print message to the printer"
msgstr "¸Þ½ÃÁö Àμâ"
-#: ui/evolution-mail.xml.h:35
-msgid "Quoted"
-msgstr "Àοë"
-
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:33
msgid "Redirect (FIXME: implement me)"
msgstr ""
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:36
msgid "Reply to _All"
msgstr "Àüü ȸ½Å(_A)"
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:39
msgid "S_ource"
msgstr ""
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
msgid "Select _All"
msgstr "ÀüºÎ ¼±ÅÃ(_A)"
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:41
msgid "Select _Thread"
msgstr "±ÛŸ·¡ ¼±ÅÃ(_T)"
-#: ui/evolution-mail.xml.h:45
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:42
+msgid "Send / Receive"
msgstr "º¸³»°í ¹Þ±â"
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:43
+msgid ""
+"Send queued mail\n"
+" and retrieve new mail"
+msgstr ""
+"¹Ð¸° ÆíÁö¸¦ º¸³»°í\n"
+" »õ ÆíÁö¸¦ °¡Á®¿Â´Ù"
+
+#: ui/evolution-mail.xml.h:45
msgid "Send queued mail and retrieve new mail"
msgstr "¹Ð¸° ÆíÁö¸¦ º¸³»°í »õ ÆíÁö¸¦ °¡Á®¿Â´Ù"
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:46
msgid "Show _All"
msgstr "¸ðµÎ º¸±â(_A)"
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:48
msgid "Threaded Message list"
msgstr "¿¬°üµÈ ¸Þ¼¼Áö ¸ñ·Ï"
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:49
msgid "VFolder on Se_nder"
msgstr "¹ß¼ÛÀÚ¿¡µû¸¥ °¡»óÆú´õ(_n)"
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:50
msgid "VFolder on _Recipients"
msgstr "¼ö½ÅÀÚ¿¡µû¸¥ °¡»óÆú´õ(_R)"
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:51
msgid "VFolder on _Subject"
msgstr "Á¦¸ñ¿¡µû¸¥ °¡»óÆú´õ(_S)"
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:52
msgid "View Raw Message Source"
msgstr "Raw ¸Þ½ÃÁö º¸±â"
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:53
msgid "Virtual Folder _Editor..."
msgstr "°¡»ó Æú´õ ÆíÁý±â(_E)..."
-#: ui/evolution-mail.xml.h:55
-msgid "_Actions"
-msgstr "Çൿ(_A)"
-
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:54
msgid "_Apply Filters"
msgstr "°Å¸£°³ Àû¿ë(_A)"
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:55
+msgid "_Attachment"
+msgstr "÷ºÎ(_A)"
+
+#: ui/evolution-mail.xml.h:56
msgid "_Compose"
msgstr "ÆíÁý(_C)"
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:57
msgid "_Copy to Folder..."
msgstr "Æú´õ·Î º¹»ç(_C)..."
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:58
msgid "_Create Filter From Message"
msgstr "¸Þ½ÃÁö·ÎºÎÅÍ °Å¸£°Ô »ý¼º(_C)"
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:60
msgid "_Expunge"
msgstr "Á¦°Å(_E)"
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:61
msgid "_Filters..."
msgstr "ÆíÁö °Å¸£°³(_F)..."
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
msgid "_Folder"
msgstr "Æú´õ(_F)"
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:63
msgid "_Forward"
msgstr "Àü´Þ(_F)"
+#: ui/evolution-mail.xml.h:64
+msgid "_Inline"
+msgstr ""
+
#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "¼±Åà ¹ÝÀü(_I)"
@@ -7476,26 +7456,34 @@ msgid "_Mail Settings..."
msgstr "¸ÞÀÏ ¼³Á¤(_M)..."
#: ui/evolution-mail.xml.h:68
-msgid "_Message Hiding"
-msgstr "¸Þ¼¼Áö ¼û±â±â(_M)"
-
-#: ui/evolution-mail.xml.h:69
msgid "_Move to Folder..."
msgstr "Æú´õ·Î À̵¿(_M)..."
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:69
msgid "_Open Selected Items"
msgstr "¼±ÅÃµÈ ¸Þ¼¼Áö ¿­±â(_S)"
+#: ui/evolution-mail.xml.h:71
+msgid "_Quoted"
+msgstr "Àοë(_Q)"
+
+#: ui/evolution-mail.xml.h:72
+msgid "_Reply"
+msgstr "ȸ½Å(_R)"
+
#: ui/evolution-mail.xml.h:73
-msgid "_Send and Receive"
+msgid "_Resend Messages"
+msgstr "¸Þ¼¼ÁöµéÀ» ´Ù½Ã º¸³»±â(_R)"
+
+#: ui/evolution-mail.xml.h:75
+msgid "_Send / Receive"
msgstr "º¸³»°í ¹Þ±â(_S)"
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:76
msgid "_Threaded"
msgstr "¾²·¹µå Ç¥½Ã(_T)"
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:78
msgid "_Undelete"
msgstr "µÇ»ì¸²(_U)"
@@ -7602,45 +7590,53 @@ msgstr "÷ºÎ¹° º¸±â"
#: ui/evolution-message-composer.xml.h:33
msgid "Sign this message with your PGP key"
-msgstr "À̸޼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
+msgstr "ÀÌ ¸Þ¼¼Áö¿¡ PGPÅ°·Î ¼­¸íÇÔ"
#: ui/evolution-message-composer.xml.h:34
msgid "Toggles whether the BCC field is displayed"
-msgstr "BCC Ç׸ñÀ» Ç¥½ÃÇÒ °ÍÀÎÁö¸¦ Åä±Û"
+msgstr "¼ûÀº ÂüÁ¶C Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
#: ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the CC field is displayed"
-msgstr "ÂüÁ¶ Ç׸ñÀ» Ç¥½ÃÇÒ °ÍÀÎÁö¸¦ Åä±Û"
+msgstr "ÂüÁ¶ Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
#: ui/evolution-message-composer.xml.h:36
msgid "Toggles whether the From chooser is displayed"
-msgstr ""
+msgstr "¹ß½Å Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Bcc Field"
-msgstr ""
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "ȸ½Å ÁÖ¼Ò Ç׸ñÀ» º¸¿©ÁÙ °ÍÀÎÁö¸¦ °áÁ¤"
#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr "¼ûÀº ÂüÁ¶ Ç׸ñ(_B)"
+
+#: ui/evolution-message-composer.xml.h:40
msgid "_Cc Field"
-msgstr ""
+msgstr "ÂüÁ¶ Ç׸ñ(_C)"
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
msgid "_From Field"
-msgstr ""
+msgstr "¹ß½Å Ç׸ñ(_F)"
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
msgid "_Insert"
msgstr "»ðÀÔ(_I)"
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
msgid "_Insert text file... (FIXME)"
msgstr "ÅؽºÆ® ÆÄÀÏ »ðÀÔ(_I)... (°íÄ¥ ¿¹Á¤)"
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
msgid "_Open..."
msgstr "¿­±â(_O)..."
#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr "ȸ½Å ÁÖ¼Ò Ç׸ñ(_R)"
+
+#: ui/evolution-message-composer.xml.h:52
msgid "_Security"
msgstr "º¸¾È(_S)"
@@ -7732,7 +7728,7 @@ msgstr "½ÇÇàÃë¼Ò"
msgid "Undo the last action"
msgstr "¸¶Áö¸· ½ÇÇà Ãë¼Ò"
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
msgid "_Appointment (FIXME)"
msgstr "¾à¼Ó(_A) (°íÄ¥¿¹Á¤)"
@@ -7856,31 +7852,35 @@ msgstr "¿ÀÇÁ¶óÀο¡¼­ ÀÛ¾÷"
msgid "_About Evolution..."
msgstr "Evolution˼(_A)..."
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "Çൿ(_A)"
+
+#: ui/evolution.xml.h:32
msgid "_Folder Bar"
msgstr ""
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
msgid "_Go to Folder..."
msgstr "Æú´õ·Î °¡±â(_G)..."
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
msgid "_Import file..."
msgstr ""
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
msgid "_Index"
msgstr "»öÀÎ(_I)"
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
msgid "_Mail message"
msgstr "ÆíÁö ¸Þ¼¼Áö(_M)"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
msgid "_New Folder"
msgstr "»õ °¡»óÆú´õ(_N)"
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
msgid "_Shortcut Bar"
msgstr "´ÜÃà ¸·´ë(_S)"
@@ -7963,6 +7963,10 @@ msgstr "ȸÀÇ Á¾·á ½Ã°£(_e):"
msgid "All Attendees"
msgstr "¸ðµç Âü¼®ÀÚ"
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr ""
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
#: widgets/misc/e-calendar-item.c:421
@@ -7982,52 +7986,24 @@ msgstr "ÇöÀç"
msgid "OK"
msgstr "È®ÀÎ"
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-msgid "%I:%M:%S %p"
+#: widgets/misc/e-cell-date-edit.c:720
+#, c-format
+msgid "The time must be in the format: %s"
msgstr ""
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
-msgstr "½Ã°£ÀÌ ºÎÀûÀýÇÕ´Ï´Ù"
-
#: widgets/misc/e-clipped-label.c:107
msgid "..."
msgstr ""
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
msgid "Save Search"
msgstr ""
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
msgid "Advanced Search"
msgstr "°í±Þ °Ë»ö"
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
msgid "Advanced ..."
msgstr "°í±Þ..."
@@ -8064,15 +8040,15 @@ msgstr "°³Àοë ÁÖ¼Ò·Ï ¼­¹ö"
msgid "The Personal Calendar Server; calendar factory"
msgstr ""
-#: wombat/wombat.c:153
+#: wombat/wombat.c:165
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): GNOME-VFS¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
-#: wombat/wombat.c:165
+#: wombat/wombat.c:177
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): ±×³ðÀ» ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"
-#: wombat/wombat.c:178
+#: wombat/wombat.c:190
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Bonobo¸¦ ÃʱâÈ­ ÇÒ ¼ö ¾ø½À´Ï´Ù"