Updated Japanese translation.

* ja.po: Updated Japanese translation. svn path=/trunk/; revision=8899
author: Akira Tagoh <tagoh@src.gnome.org> 2001-03-23 03:31:38 +0800
committer: Akira Tagoh <tagoh@src.gnome.org> 2001-03-23 03:31:38 +0800
commit: 65cb1664da2ba2bb678ee78b8dff1fd01b297cc0 (patch)
tree: 96c39d5bd77f5f2010083900107516790b6c7b90 /po
parent: 81742b667755e307683e6178d073ee8f31661d5c (diff)
download: gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.gz
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.zst
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.zip
2 files changed, 2004 insertions, 1680 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 82a090493f..6763618243 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-23  Akira TAGOH  <tagoh@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
 2001-03-21  H嶰tor Garc燰 翼varez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/ja.po b/po/ja.po
index 79fe86d2e0..b59e7c6a53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,23 +2,22 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS-20010216\n"
-"POT-Creation-Date: 2001-02-16 18:32-0500\n"
-"PO-Revision-Date: 2001-02-16 19:48-0500\n"
+"Project-Id-Version: evolution CVS-20010323\n"
+"POT-Creation-Date: 2001-03-23 02:56+0900\n"
+"PO-Revision-Date: 2001-03-23 04:30+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\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: "
@@ -26,7 +25,7 @@ msgstr ""
 "\n"
 "抩蟆: "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3258
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,19 +33,21 @@ msgstr ""
 "\n"
 "  滄憊(蟆勾仃):     "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3259
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
+"\n"
+"  屨:      "
 
-#: 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:     "
@@ -54,7 +55,7 @@ msgstr ""
 "\n"
 "  白央立伉□抩:     "
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "  Suffix:     "
@@ -62,7 +63,7 @@ msgstr ""
 "\n"
 "  滄憊(詨勾仃):     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3276
 msgid ""
 "\n"
 "Birth Date: "
@@ -70,7 +71,7 @@ msgstr ""
 "\n"
 "藕戲ざ: "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3287
 msgid ""
 "\n"
 "Address:"
@@ -78,7 +79,7 @@ msgstr ""
 "\n"
 "蝠赭:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3289
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -86,7 +87,7 @@ msgstr ""
 "\n"
 "芧忐⺀寞:  "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3290
 msgid ""
 "\n"
 "  Ext:         "
@@ -94,25 +95,25 @@ msgstr ""
 "\n"
 "  "
 
-#: 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:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3293
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3294
 msgid ""
 "\n"
 "  Postal Code: "
@@ -120,7 +121,7 @@ msgstr ""
 "\n"
 "  芧忐⺀寞: "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3295
 msgid ""
 "\n"
 "  Country:     "
@@ -128,13 +129,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"
@@ -142,7 +143,7 @@ msgstr ""
 "\n"
 "齬狪⺀寞:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Telephone:"
@@ -150,7 +151,7 @@ msgstr ""
 "\n"
 "齬狪⺀寞:"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3347
 msgid ""
 "\n"
 "E-mail:\n"
@@ -158,7 +159,7 @@ msgstr ""
 "\n"
 "丟□伙:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "E-mail:"
@@ -166,7 +167,7 @@ msgstr ""
 "\n"
 "丟□伙:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3369
 msgid ""
 "\n"
 "Mailer: "
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "丟□仿: "
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3375
 msgid ""
 "\n"
 "Time Zone: "
@@ -182,7 +183,7 @@ msgstr ""
 "\n"
 "正奶丞札□件: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3383
 msgid ""
 "\n"
 "Geo Location: "
@@ -190,7 +191,7 @@ msgstr ""
 "\n"
 "煩啕: "
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3387
 msgid ""
 "\n"
 "Business Role: "
@@ -198,7 +199,7 @@ msgstr ""
 "\n"
 "酷儀及縝抭: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3399
 msgid ""
 "\n"
 "Org: "
@@ -206,7 +207,7 @@ msgstr ""
 "\n"
 "賺縞: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3400
 msgid ""
 "\n"
 "  Name:  "
@@ -214,7 +215,7 @@ msgstr ""
 "\n"
 "  模抩:  "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3401
 msgid ""
 "\n"
 "  Unit:  "
@@ -222,7 +223,7 @@ msgstr ""
 "\n"
 "  朿踢:  "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3402
 msgid ""
 "\n"
 "  Unit2: "
@@ -230,7 +231,7 @@ msgstr ""
 "\n"
 "  朿踢2: "
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3403
 msgid ""
 "\n"
 "  Unit3: "
@@ -238,7 +239,7 @@ msgstr ""
 "\n"
 "  朿踢3: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3404
 msgid ""
 "\n"
 "  Unit4: "
@@ -246,7 +247,7 @@ msgstr ""
 "\n"
 "  朿踢4: "
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3408
 msgid ""
 "\n"
 "Categories: "
@@ -254,7 +255,7 @@ msgstr ""
 "\n"
 "僅抭坌沓: "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "Comment: "
@@ -272,13 +273,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: "
@@ -299,131 +300,13 @@ msgstr "Evolution 尺 GnomeCard 白央奶伙毛奶件禾□玄"
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 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 "由奶伕永玄井日戊疋□"
-
-#: 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 "由奶伕永玄尺戊疋□"
-
-#: 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 "由奶伕永玄井日穴□斥"
-
-#: 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 "由奶伕永玄尺穴□斥"
-
-#: 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 "JP Rosevear <jpr@helixcode.com>"
-
-#: 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 "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: 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 "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: 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 "gnome-unknown.xpm"
-
-#: 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"
-"'由奶伕永玄伉件弁皿伕由氾奴' 平乓皿伊永玄毛薊鎗仄化仁分今中"
-
-#: 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 ""
-"gnome-pilot 犯□乒件井日由奶伕永玄伉旦玄毛\n"
-"潸丿仄方丹午仄凶凜卞巨仿□互�戲仄引仄凶"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "市□末伙反厶心慇引木月仇午互請侳引六氏匹仄凶\n"
@@ -450,14 +333,6 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "由奶伕永玄及失玉伊旦失皿伉弗□扑亦件皮伕永弁毛厶心慇戈仇午互請侳引六氏匹仄凶"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "失玉伊旦罌戊件斥永玄及澀爛"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution 失玉伊旦罌戊件斥永玄 "
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -520,7 +395,7 @@ msgid "Phone Types"
 msgstr "齬狪潘帎"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "潛邰卅丟□伙"
 
@@ -533,6 +408,7 @@ msgid "Web page address:"
 msgstr "它尼皮矢□斥及 URL:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:82
 msgid "_Add"
 msgstr "馨笛(_A)"
 
@@ -557,8 +433,8 @@ msgid "_Company:"
 msgstr "莘模(_C):"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: 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)"
 
@@ -610,113 +486,129 @@ msgstr "仇木反芧忐坁及蝠赭匹允"
 msgid "Delete Contact?"
 msgstr "戊件正弁玄毛綽輪仄引允井?"
 
-#: addressbook/contact-editor/e-contact-editor.c:574
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "仇及戊件正弁玄反仇木日及市氾打伉卞赭簞仄化中引允:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: 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:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: 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:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: 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:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
 msgid "Business Fax"
 msgstr "酷儀及 FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "裟太枑仄"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: 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:1283
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "莘模"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: 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:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: 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:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:614
 msgid "Home Fax"
 msgstr "笮及 FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:617
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: 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:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
+#: 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:1290
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "公及職及 FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: 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:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: 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:1293
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "仿斥左"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "氾伊永弁旦"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: 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:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: 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 "戊件正弁玄及棵啞馨笛"
+
+#: 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(_2):"
@@ -829,25 +721,25 @@ msgstr "滄憊(詨勾仃)(_S):"
 msgid "_Title:"
 msgstr "滄憊(蟆勾仃)(_T):"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "立瓦市□玉"
 
-#: addressbook/gui/component/addressbook.c:236
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "氾□皮伙(_T)"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:413
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s 及由旦伐□玉毛じ恘仄化仁分今中"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:441
 msgid "Unable to open addressbook"
 msgstr "失玉伊旦罌毛釩仁仇午互請侳引六氏"
 
-#: addressbook/gui/component/addressbook.c:438
+#: 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"
@@ -868,27 +760,27 @@ msgstr ""
 "母它件伕□玉﹞公仄化奶件旦玄□伙仄化, 戊件由奶伙酷躂仄\n"
 "化 Evolution 毛奶件旦玄□伙允月优邰互丐月匹仄斤丹.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:569
 msgid "Show All"
 msgstr "允屯化刓憎"
 
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:571
 msgid "Advanced..."
 msgstr "擇稱..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:601
 msgid "Any field contains"
 msgstr "白奴□伙玉互慼及手及毛殖戈"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:602
 msgid "Name contains"
 msgstr "抩蟆互慼及手及毛殖戈"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:603
 msgid "Email contains"
 msgstr "丟□伙互慼及手及毛殖戈"
 
-#: addressbook/gui/component/addressbook.c:738
+#: addressbook/gui/component/addressbook.c:746
 msgid "The URI that the Folder Browser will display"
 msgstr "白巧伙母皮仿它扒互刓憎允月 URI"
 
@@ -913,9 +805,9 @@ msgid "None (anonymous mode)"
 msgstr "卅仄 (丶抩乒□玉)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-provider.c:75
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid "Password"
 msgstr "由旦伐□玉"
 
@@ -956,7 +848,7 @@ msgid "Remember this password"
 msgstr "仇及由旦伐□玉毛筏盛"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Host:"
 msgstr "石旦玄:"
 
@@ -990,7 +882,7 @@ msgid "Authentication:"
 msgstr "カ據杅摯:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
 msgid "Path:"
 msgstr "由旦:"
 
@@ -1018,7 +910,7 @@ msgstr ""
 "丐卅凶及儅勾失玉伊旦罌毛薊鎗仄, 公木卞勾中化及楮洘仄凶樹扷毛じ恘仄化仁分今中"
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "抩蟆:"
 
@@ -1043,7 +935,7 @@ 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:7 mail/folder-browser.c:684
+#: 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:6 ui/evolution-task-editor-dialog.xml.h:18
@@ -1052,12 +944,12 @@ msgstr "綽輪"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "彸螂"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Name"
 msgstr "抩蟆"
 
@@ -1065,31 +957,57 @@ msgstr "抩蟆"
 msgid "URI"
 msgstr "URI"
 
+#: 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 "失玉伊旦毛刓憎允月凶戶及 Bonobo 戊件玄伕□伙"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "失玉伊旦罌毛刓憎允月 Bonobo 戊件玄伕□伙及扔件皿伙匹允"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution 失玉伊旦罌立瓦市□玉毛刓憎允月戊件玄伕□伙"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution 失玉伊旦罌立瓦市□玉申亙□失"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "戊件正弁玄毛健丹凶戶及 Evolution 戊件禾□生件玄"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "失玉伊旦罌立瓦市□玉戊件玄伕□伙及凶戶及白央弁玄伉"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr "失玉伊旦罌及失玉伊旦刓憎及凶戶及白央弁玄伉"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Evolution 失玉伊旦罌戊件禾□生件玄及凶戶及白央弁玄伉"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "扔件皿伙失玉伊旦罌戊件玄伕□伙及凶戶及白央弁玄伉"
 
@@ -1101,6 +1019,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 "腹綢..."
@@ -1229,64 +1157,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+#: 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:570
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "* Click here to add a contact *"
 msgstr "* 戊件正弁玄毛馨笛允月凶戶卞仇仇毛弁伉永弁 *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Email"
 msgstr "丟□伙"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:610
 msgid "Organization"
 msgstr "賺縞"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Web Site"
 msgstr "它尼皮扔奶玄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:623
 msgid "Department"
 msgstr "繫癲朿踢"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Office"
 msgstr "儀抭赭"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Title"
 msgstr "滄憊(蟆勾仃)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Profession"
 msgstr "燬杹縝"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/gui/widgets/e-addressbook-view.c:627
 msgid "Manager"
 msgstr "穴生□斥乓"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:629
 msgid "Nickname"
 msgstr "瓦永弁生□丞"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Spouse"
 msgstr "ミ塒樊"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Note"
 msgstr "用□玄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:633
 msgid "Click here to add a contact"
 msgstr "戊件正弁玄毛馨笛允月凶戶卞仇仇毛弁伉永弁"
 
@@ -1294,7 +1222,7 @@ msgstr "戊件正弁玄毛馨笛允月凶戶卞仇仇毛弁伉永弁"
 msgid "Save in addressbook"
 msgstr "失玉伊旦罌卞忡繡"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
 "\n"
 "\n"
@@ -1308,6 +1236,10 @@ msgstr ""
 "\n"
 "母皮伙弁伉永弁毛仄化蕙筋戊件正弁玄毛綜嶽仄化票今中"
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "抩銅刓憎"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1465,7 +1397,7 @@ msgstr "旦正奶伙抩:"
 msgid "Top:"
 msgstr "曉:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "潘帎:"
 
@@ -1473,18 +1405,6 @@ msgstr "潘帎:"
 msgid "Width:"
 msgstr "汔:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: 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"
@@ -1496,130 +1416,131 @@ msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "由奶伕永玄及市伊件母失皿伉弗□扑亦件皮伕永弁毛厶心慇戈仇午互請侳引六氏匹仄凶"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "GnomeCal 澀爛戊件斥永玄"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution 市伊件母戊件斥永玄"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "todo 戊件斥永玄及澀爛"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo 戊件斥永玄 "
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo 戊件斥永玄"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolutiuon ToDo 戊件斥永玄及凶戶及澀爛交□氾奴伉氾奴匹允\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 ""
 "由奶伕永玄及 ToDo 失皿伉弗□扑亦件皮伕永弁毛厶心慇戈仇午互請侳引六氏匹仄凶"
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "沶竄及瘍瞼"
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "失仿□丞曩鞅"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: 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:444
+#: calendar/gui/calendar-commands.c:478
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "市伊件母申亙□毛綜嶽請侳引六氏匹仄凶. ORBit午OAF及澀爛毛民尼永弁仄化仁分今中"
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: 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"
-msgstr "%Y/%m/%d (%a)"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d (%a) %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
-msgstr "跤讀"
+msgstr "域�"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "颱讀"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
-msgstr "窗怍"
+msgstr "傷⻌"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: 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:199
 msgid "Unknown"
 msgstr "怳襞"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "佮"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "え"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "鱗"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "擰"
 
-#: calendar/gui/calendar-model.c:547
+#: 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 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 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 mail/message-list.c:624
+msgid "Low"
+msgstr "斕中"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "⑨抸"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "尕⑨抸"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "釩銨仄化中卅中"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "質咥醱"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "敦弇仄引仄凶"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+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:277
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:286
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1630,36 +1551,25 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+"坌挀毛 '域�', '颱讀', '傷⻌' 丐月中反 '卅仄' 毛薊鎗仄卅仃木壬卅曰引六氏"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. 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: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:45 shell/e-shell-view.c:1119
+#: 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"
+msgstr "用□玄"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1669,64 +1579,71 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "由□本件玄襖反 0 午 100 及棉匹殖氏匹中卅仃木壬卅曰引六氏"
 
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "穸燮賜匏反 1 午 9 及棉匹殖氏匹中卅仃木壬卅曰引六氏"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+"穸燮蘸毛 '嫖中', '忔騷', '斕中' 丐月中反 '怳爛聒' 毛薊鎗仄卅仃木壬卅曰引六氏"
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "忔騷"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "怳爛聒"
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "瘋�"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "喃癲化碧心"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "反中"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "中中尹"
 
-#: calendar/gui/calendar-summary.c:197
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%p %I:%M"
 
-#: calendar/gui/calendar-summary.c:438
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>市伊件母毛伕□玉醱卞巨仿□</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>市伊件母毛伕□玉醱卞巨仿□:<br>丟末永玉反扔禾□玄仄化中引六氏"
 
-#: calendar/gui/calendar-summary.c:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "刓憎"
 
-#: calendar/gui/calendar-summary.c:625
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "沶竄及刓憎"
 
-#: calendar/gui/calendar-summary.c:633
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "正旦弁及刓憎"
 
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "市伊件母毛伕□玉醱"
 
@@ -1734,6 +1651,39 @@ msgstr "市伊件母毛伕□玉醱"
 msgid "The URI that the calendar will display"
 msgstr "市伊件母互刓憎允月 URI"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "沶竄及瘍瞼"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "失仿□丞曩鞅"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "失仿□丞騷襞扔□申旦"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "失仿□丞騷襞扔□申旦及凶戶及白央弁玄伉"
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "GNOME 及賡渝祭互請侳引六氏匹仄凶"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+msgid "Could not create the alarm notify service factory"
+msgstr "失仿□丞騷襞扔□申旦白央弁玄伉毛綜嶽請侳引六氏匹仄凶"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M 卞失仿□丞"
@@ -1802,7 +1752,7 @@ msgid "Beep when alarm windows appear."
 msgstr "失仿□丞它奴件玉它互蜇木凶凜 BEEP 祥毛昉日允"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "市伊件母"
 
@@ -1831,7 +1781,7 @@ msgid "Display options"
 msgstr "刓憎左皿扑亦件"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "渝ざ"
 
@@ -1852,7 +1802,7 @@ msgid "Fri"
 msgstr "嗯"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "嗯豖ざ"
 
@@ -1881,7 +1831,7 @@ msgid "Mon"
 msgstr "畸"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "畸豖ざ"
 
@@ -1894,11 +1844,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:162
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "穸燮蘸"
 
@@ -1916,7 +1867,7 @@ msgid "Sat"
 msgstr "蘿"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "蘿豖ざ"
 
@@ -1941,7 +1892,7 @@ msgid "Sun"
 msgstr "ざ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "ざ豖ざ"
 
@@ -1954,7 +1905,7 @@ msgid "Thu"
 msgstr "枆"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "枆豖ざ"
 
@@ -1975,7 +1926,7 @@ msgid "Tue"
 msgstr "紹"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "紹豖ざ"
 
@@ -1988,7 +1939,7 @@ msgid "Wed"
 msgstr "踹"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "踹豖ざ"
 
@@ -2001,7 +1952,7 @@ msgid "minutes before they occur."
 msgstr "坌蟆"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:86
 msgid "seconds."
 msgstr " 卍"
 
@@ -2041,20 +1992,12 @@ msgstr "庍凳毛忡繡仄凶中匹允井?"
 msgid "% Comp_lete:"
 msgstr "% 敦弇(_l):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "平乓件本伙仄引仄凶"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "坌挀"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "敦弇仄引仄凶"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
@@ -2064,22 +2007,6 @@ msgstr "ざ尥午凜棉"
 msgid "Date Completed:"
 msgstr "敦弇ざ:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "嫖中"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "質咥醱"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "斕中"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "釩銨仄化中卅中"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2111,10 +2038,6 @@ msgstr "正旦弁"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "怳爛聒"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2141,91 +2064,146 @@ msgstr "旦氾□正旦(_S):"
 msgid "Edit Task"
 msgstr "正旦弁及彸螂"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "扔穴伉□卅仄"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "沶竄 - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "正旦弁 - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "酷沭筏じ - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "市氾打伉"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "敦弇ざ"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "蔽弇ざ"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "釩銨ざ"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "啕蘸煩蘸"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.c:163
+msgid "Percent complete"
+msgstr "由□本件玄敦弇"
+
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "扔穴伉□"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "失仿□丞"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "正旦弁毛馨笛允月凶戶卞仇仇毛弁伉永弁"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "敦弇毛穴□弁"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "敦弇仄凶正旦弁毛穴□弁仄引允"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "仇及正旦弁毛彸螂..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "正旦弁毛彸螂仄引允"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "仇及正旦弁毛綽輪仄引允"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "正旦弁毛綽輪仄引允"
 
@@ -2236,68 +2214,78 @@ msgstr "%02i 坌坌喃"
 
 #. 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:1273
+#: 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 "%B %d %A"
 
 #. 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:1287
+#: 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 "%b/%d (%a)"
 
 #. 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:1300
+#: 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 "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: 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:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: 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:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-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:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-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:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "仇及沶竄毛彸螂..."
+#: 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:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: 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:3045 calendar/gui/e-week-view.c:3252
+msgid "Delete this Appointment"
 msgstr "仇及沶竄毛綽輪"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "仇及沶竄毛第⑹卞允月"
+#: 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:3056 calendar/gui/e-week-view.c:3267
+msgid "Make this Occurrence Movable"
+msgstr "仇及請侳儀毛第⑹卞允月"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: 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:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3060
+msgid "Delete all Occurrences"
 msgstr "允屯化及請侳儀毛綽輪"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2382,7 +2370,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 "ざ尥:"
 
@@ -2394,7 +2382,7 @@ msgstr "市伊件母毛伕□玉醱..."
 msgid "Organizer:"
 msgstr "潛瘍樊:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
 msgid "Sender"
 msgstr "霜耨樊"
 
@@ -2486,26 +2474,26 @@ msgstr ""
 "旦弗斥亙□伙\n"
 "凜棉"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1167
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
+#: mail/message-list.c:1014
 msgid "Status"
 msgstr "旦氾□正旦"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "允屯化"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "市氾打伉:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' 及正旦弁毛厶心慇戈仇午互請侳引六氏匹仄凶"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' 毛厶心慇戈仇午毛邰菲今木月丟末永玉反扔禾□玄仄化中引六氏"
@@ -2517,6 +2505,14 @@ msgstr "'%s' 毛厶心慇戈仇午毛邰菲今木月丟末永玉反扔禾□玄仄化中引六氏"
 msgid "%d %B"
 msgstr "%B %d"
 
+#: 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 "允屯化及請侳儀毛綽輪"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "咍ざ及奶矛件玄(_l)"
@@ -2550,7 +2546,7 @@ msgid "No recurrence"
 msgstr "瘋�卅仄"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "祥啼毛瘋戲"
 
@@ -2571,21 +2567,21 @@ msgid "Reminder"
 msgstr "瘍瞼橇"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "皿伕弘仿丞毛撢墊允月"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "丟□伙毛霜耨允月"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "澀爛..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "母奶失伕弘毛刓憎允月"
 
@@ -2605,11 +2601,12 @@ msgstr "釩銨凜棉(_S):"
 msgid "_Starting date:"
 msgstr "釩銨ざ(_S):"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
+#. 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:26
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "蟆"
 
@@ -2634,169 +2631,161 @@ msgid "hour(s)"
 msgstr "凜"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "坌"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "畸"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "沶竄及瘉賡"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "引匹"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "蔥"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "コ"
 
-#: calendar/gui/event-editor.c:369
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "沶竄及彸螂"
 
-#: calendar/gui/event-editor.c:447
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "ざ"
 
-#: calendar/gui/event-editor.c:599
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:752
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "請侳儀"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "仇及沶竄反 Evolution 互彸螂請侳卅中瘋�毛殖氏匹中引允"
 
-#: calendar/gui/event-editor.c:1521
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr "%d ざ"
 
-#: calendar/gui/event-editor.c:1523
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr "1 ざ"
 
-#: calendar/gui/event-editor.c:1526
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr "%d 蔥棉"
 
-#: calendar/gui/event-editor.c:1528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr "1 蔥棉"
 
-#: calendar/gui/event-editor.c:1531
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr "%d 凜棉"
 
-#: calendar/gui/event-editor.c:1533
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr "1 凜棉"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr "%d 坌"
 
-#: calendar/gui/event-editor.c:1538
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr "1 坌"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr "%d 卍"
 
-#: calendar/gui/event-editor.c:1543
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr "1 卍"
 
-#: calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr "瘉賡及沶竄及蟆"
 
-#: calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr "瘉賡及沶竄及詨"
 
-#: calendar/gui/event-editor.c:1600
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr "瘉詨及沶竄及蟆"
 
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr "瘉詨及沶竄及詨"
 
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "市伊件母毛刓憎允月 Bonobo 戊件玄伕□伙及扔件皿伙"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution 市伊件母撢墊扔穴伉戊件禾□生件玄"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution 市伊件母 iTip/iMip 申亙□失"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
 msgstr "市伊件母毛健丹凶戶及 Evolution 戊件禾□生件玄"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
 msgstr "市伊件母扔穴伉□戊件禾□生件玄及凶戶及白央弁玄伉"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Evolution calendar component."
 msgstr "Evolution 市伊件母戊件禾□生件玄及凶戶及白央弁玄伉"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr "市伊件母 iTip 申亙□戊件玄伕□伙及凶戶及白央弁玄伉"
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "市伊件母毛刓憎允月 Bonobo 戊件玄伕□伙及扔件皿伙"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr "扔件皿伙市伊件母戊件玄伕□伙及白央弁玄伉"
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' 及白巧伙母毛釩仁仇午互請侳引六氏匹仄凶"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' 毛釩仁仇午毛邰菲今木月丟末永玉反扔禾□玄仄化中引六氏"
@@ -2857,199 +2846,197 @@ msgstr "10 畸"
 msgid "September"
 msgstr "9 畸"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME 及賡渝祭互請侳引六氏匹仄凶"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1 ざ"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2 ざ"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3 ざ"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4 ざ"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5 ざ"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6 ざ"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7 ざ"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8 ざ"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9 ざ"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10 ざ"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11 ざ"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12 ざ"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13 ざ"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14 ざ"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15 ざ"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16 ざ"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17 ざ"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18 ざ"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19 ざ"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20 ざ"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21 ざ"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22 ざ"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23 ざ"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24 ざ"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25 ざ"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26 ざ"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27 ざ"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28 ざ"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29 ざ"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30 ざ"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31 ざ"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "ざ"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "畸"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "紹"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "踹"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "枆"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "嗯"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "蘿"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "正旦弁"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "漆ざ及ざ尥 [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "漆蔥 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "漆畸 (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "漆コ (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "市伊件母及執綬"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+#: 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 "執綬皿伊申亙□"
 
@@ -3057,26 +3044,54 @@ msgstr "執綬皿伊申亙□"
 msgid "The URI of the tasks folder to display"
 msgstr "正旦弁白巧伙母互刓憎允月 URI"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: camel/camel-filter-driver.c:767
+#: camel/camel-filter-driver.c:848
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "白奴伙正及厭妐荸橾醱卞巨仿□: %s: %s"
 
-#: camel/camel-filter-driver.c:772
+#: camel/camel-filter-driver.c:853
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "白奴伙正撢墊醱卞巨仿□: %s: %s"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 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"
@@ -3085,7 +3100,7 @@ msgstr ""
 "懇筋刓蜇及厭妐毛荸橾請侳引六氏: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3094,16 +3109,16 @@ msgstr ""
 "懇筋刓蜇匹及腹綢毛撢墊醱卞巨仿□: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+#: 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:547
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3184,82 +3199,207 @@ msgstr "Movemail 皿伕弘仿丞反撩ヘ仄引仄凶: %s"
 msgid "(Unknown error)"
 msgstr "(怳襞及巨仿□)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s 毛伕□玉請侳引六氏匹仄凶: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s 毛伕□玉請侳引六氏匹仄凶: 乒斥亙□伙及戊□玉互賡渝祭今木化中引六氏"
 
-#: 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:214
+#: 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 "%s (禾□玄 %d) 尺濤糧請侳引六氏匹仄凶: %s"
 
-#: 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:538
+#: 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:445
+msgid "Server unexpectedly disconnected"
+msgstr "扔□田反⼳螺濠蠅仄引仄凶"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+msgid "Authentication failed."
+msgstr "カ據卞撩ヘ仄引仄凶"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"拑躲卅丟□伙失玉伊旦玄伊□旦樹扷:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:118
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"拑躲匹尕第荸卅玄伊□旦樹扷:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"拑躲卅玄伊□旦樹扷:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"手仄扔□田互扔禾□玄仄化中月卅日, 仇及左皿扑亦件反本平亙失卅 CRAM-MD5 "
+"カ據毛銀勻化扔□田尺濤糧仄引允"
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"手仄扔□田互扔禾□玄仄化中月卅日, 仇及左皿扑亦件反本平亙失卅 DIGEST-MD5 "
+"毛銀勻化扔□田卞濤糧仄引允"
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr "扔□田及殺蠶反カ據犯□正毛殖氏匹中引六氏\n"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr "扔□田及殺蠶反域譙仄引六氏\n"
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "仇及左皿扑亦件反 Kerberos 4 カ據毛銀勻化扔□田卞濤糧仄引允"
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos 民弗永玄毛潸丿允月仇午互請侳引六氏匹仄凶:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:418
+msgid "Bad authentication response from server."
+msgstr "扔□田井日棉啜勻凶カ據殺蠶互丐曰引仄凶"
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr "皿伊奶件"
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"手仄扔□田互扔禾□玄仄化中月卅日, 仇及左皿扑亦件反皿伊奶件 SASL "
+"丟市瓦朮丞毛銀勻化扔□田卞濤糧仄引允"
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "懇筋刓蜇及彸螂卞撩ヘ: %s: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:139
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' 反交□扒抩戊件禾□生件玄互优邰匹允"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' 反石旦玄戊件禾□生件玄互优邰匹允"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' 反由旦戊件禾□生件玄互优邰匹允"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:478
 #, c-format
 msgid "No such host %s."
 msgstr "公及方丹卅石旦玄 %s 反丐曰引六氏"
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:481
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "域凜讀卞石旦玄抩 %s 毛葦勾仃月仇午互請侳引六氏"
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "移邂白巧伙母丟□伙皿伕田奶母"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:320
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "皿伕玄戊伙 `%s' 毛厙迕匹五月皿伕田奶母反丐曰引六氏"
 
-#: camel/camel-session.c:394
+#: camel/camel-session.c:415
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3268,33 +3408,31 @@ msgstr ""
 "犯奴伊弁玄伉 %s 毛綜嶽請侳引六氏:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. 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
 msgid "URL string `%s' contains no protocol"
 msgstr "URL 妐儂昫 `%s' 反皿伕玄戊伙毛殖氏匹中引六氏"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL 妐儂昫 `%s' 反拑躲卅皿伕玄戊伙毛殖氏匹中引允"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "URL `%s' 及禾□玄⺀寞反醒儂匹反丐曰引六氏"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:962
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos 民弗永玄毛潸丿允月仇午互請侳引六氏匹仄凶:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "扔□田井日棉啜勻凶カ據殺蠶互丐曰引仄凶"
+msgid "No such message: %s"
+msgstr "公及方丹卅丟永本□斥反丐曰引六氏: %s"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3306,7 +3444,7 @@ msgstr "IMAP 扔□田井日芺渝仄卅中殺蠶互丐曰引仄凶: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP 戊穴件玉反撩ヘ仄引仄凶: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "怳襞及巨仿□"
 
@@ -3324,44 +3462,68 @@ msgstr "IMAP 扔□田及殺蠶反 %s 樹扷毛殖氏匹中引六氏"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP 扔□田井日芺渝仄卅中 OK 殺蠶互丐曰引仄凶: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:176
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s 及扔穴伉□毛伕□玉請侳引六氏匹仄凶"
 
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
+#: camel/providers/imap/camel-imap-folder.c:345
+msgid "Scanning IMAP folder"
+msgstr "IMAP 白巧伙母毛雖犖醱"
+
+#: 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 "FETCH 殺蠶卞丟永本□斥呿蟲毛葦尥仃月仇午互請侳引六氏匹仄凶"
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:40
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: 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 "IMAP 扔□田匹丟□伙毛厶氏分曰蹺檐允月凶戶及手及匹允"
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "Secure IMAPv4"
+msgstr "本平亙失 IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "SSL 濤糧毛旋尹化 IMAP 扔□田曉及丟□伙毛厶氏分曰忡繡允月凶戶及手及匹允"
+
+#: camel/providers/imap/camel-imap-provider.c:77
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "仇及左皿扑亦件反皿伊奶件氾平旦玄由旦伐□玉毛銀勻化 IMAP 扔□田卞濤糧仄引允"
 
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:441
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP 扔□田 %s 反邰菲仄凶カ據正奶皿 %s 毛扔禾□玄仄化中引六氏"
 
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "仇及左皿扑亦件反 Kerberos 4 カ據毛銀勻化 IMAP 扔□田卞濤糧仄引允"
+#: 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:369
+#: camel/providers/imap/camel-imap-store.c:476
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s 及 IMAP 由旦伐□玉毛じ恘仄化仁分今中"
 
-#: camel/providers/imap/camel-imap-store.c:397
+#: 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:519
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3372,11 +3534,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:674
+#: camel/providers/imap/camel-imap-store.c:871
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "犯奴伊弁玄伉 %s 毛綜嶽請侳引六氏匹仄凶: %s"
 
+#: 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 "MH 溥摯及丟□伙犯奴伊弁玄伉"
@@ -3385,19 +3551,19 @@ msgstr "MH 溥摯及丟□伙犯奴伊弁玄伉"
 msgid "For storing local mail in MH-like mail directories"
 msgstr "MH仿奶弁卅丟□伙犯奴伊弁玄伉卞伕□市伙丟□伙毛忡繡仄引允"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:46
 msgid "Standard Unix mailbox file"
 msgstr "伓賞讀卅 UNIX 及 mailbox 白央奶伙"
 
-#: 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 "伓賞 mbox 滇摯匹伕□市伙丟□伙毛忡繡仄引允"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:56
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir滇摯及丟□伙白央奶伙"
 
-#: 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 "qmail maildir犯奴伊弁玄伉卞伕□市伙丟□伙毛忡繡仄引允"
 
@@ -3608,7 +3774,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "白巧伙母毛扔穴仿奶朮允月仇午互請侳引六氏: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
 msgid "Synchronising folder"
 msgstr "白巧伙母毛⑺渝醱"
 
@@ -3740,25 +3906,25 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s 及 .newsrc 白央奶伙毛綜嶽引凶反釩仁仇午互請侳引六氏: %s"
 
-#: 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 "uid %s 及丟永本□斥反丐曰引六氏"
 
-#: 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 "POP 扔□田 %s 井日丟永本□斥毛潸丿請侳引六氏匹仄凶: %s"
@@ -3776,7 +3942,21 @@ msgstr ""
 "丟□伙皿伕田奶母支卩憤及丟□伙扑旦氾丞井日 E "
 "丟□伙毛熬耨允月凶戶卞銀丹仇午互請侳引允"
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:52
+msgid "Secure POP"
+msgstr "本平亙失 POP"
+
+#: 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 ""
+"SSL 濤糧毛旋尹凶 POP 扔□田尺濤糧允月凶戶卞, POP 皿伕玄戊伙反冂爛及 web "
+"丟□伙皿伕田奶母支卩憤及丟□伙扑旦氾丞井日 E "
+"丟□伙毛熬耨允月凶戶卞銀丹仇午互請侳引允"
+
+#: 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."
@@ -3784,7 +3964,7 @@ msgstr ""
 "仇及左皿扑亦件反皿伊奶件氾平旦玄及由旦伐□玉毛銀勻化 POP 扔□田尺濤糧仄引允. "
 "仇木反聶仁及 POP 扔□田匹扔禾□玄今木月左皿扑亦件匹允"
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: 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 "
@@ -3794,27 +3974,27 @@ msgstr ""
 "扔□田尺濤糧仄引允. 仇木反跤尪卅扔禾□玄毛邰菲允月扔□田匹, "
 "允屯化及交□扒互懇橘卞⑹綜允月歹仃匹反丐曰引六氏."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: 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 "仇木反 POP 扔□田尺濤糧仄, Kerberos 4 カ據毛銀中引允."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: 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:326
+#: camel/providers/pop3/camel-pop3-store.c:298
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s 及 POP 扔□田尺濤糧請侳引六氏匹仄凶"
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s %s@%s 及 POP3 由旦伐□玉毛じ恘仄化仁分今中"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:356
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3823,12 +4003,12 @@ msgstr ""
 "POP 扔□田尺濤糧請侳引六氏\n"
 "交□扒抩及霜耨醱卞巨仿□: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: 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:422
+#: camel/providers/pop3/camel-pop3-store.c:386
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3836,7 +4016,7 @@ msgstr ""
 "POP 扔□田尺濤糧請侳引六氏\n"
 "邰菲仄凶カ據澎蟾反扔禾□玄仄化中引六氏"
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3845,13 +4025,13 @@ msgstr ""
 "POP 扔□田尺濤糧匹五引六氏\n"
 "由旦伐□玉及霜耨醱卞巨仿□: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:503
 #, c-format
 msgid "No such folder `%s'."
 msgstr "公及方丹卅白巧伙母 `%s' 反丐曰引六氏"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3893,237 +4073,253 @@ msgstr "%s 毛撢墊請侳引六氏匹仄凶: 丟□伙反霜耨仄引六氏匹仄凶"
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 反旦氾□正旦 %d 匹蔽弇仄引仄凶: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+msgid "Could not find 'From' address in message"
+msgstr "丟永本□斥卞 'From' 失玉伊旦毛葦勾仃月仇午互請侳引六氏匹仄凶"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: 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:56
+#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
 msgid "SMTP"
 msgstr "SMTP"
 
-#: 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 "SMTP毛銀勻化伉乒□玄丟□伙甩皮卞濤糧允月仇午匹丟□伙毛ミ耨仄引允\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:52
+msgid "Secure SMTP"
+msgstr "本平亙失 SMTP"
+
+#: 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 ""
+"SSL 濤糧毛旋尹凶 "
+"SMTP毛銀勻化伉乒□玄丟□伙甩皮卞濤糧允月仇午匹丟□伙毛ミ耨仄引允\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Syntax error, command unrecognized"
 msgstr "厭妐荸橾巨仿□, 戊穴件玉匹反丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Syntax error in parameters or arguments"
 msgstr "由仿丟□正丐月中反婁醒卞厭妐荸橾巨仿□"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Command not implemented"
 msgstr "戊穴件玉反撢隸今木化中引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Command parameter not implemented"
 msgstr "戊穴件玉由仿丟□正反撢隸今木化中引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:154
 msgid "System status, or system help reply"
 msgstr "扑旦氾丞旦氾□正旦丐月中反扑旦氾丞目伙皿殺蠶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Help message"
 msgstr "目伙皿丟永本□斥"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Service ready"
 msgstr "扔□申旦反厙迕匹五引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Service closing transmission channel"
 msgstr "扔□申旦反霜耨民乓件生伙毛岉元化中引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Service not available, closing transmission channel"
 msgstr "扔□申旦反厙迕匹五引六氏, 霜耨民乓件生伙毛岉元化中引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Requested mail action okay, completed"
 msgstr "邰菲今木凶丟□伙及⑹綜反OK, 敦弇仄引仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:166
 msgid "User not local; will forward to <forward-path>"
 msgstr "交□扒反伕□市伙匹反丐曰引六氏; <forward-path> 尺鱉霜仄引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邰菲今木凶丟□伙及⑹綜反敦弇仄引六氏: 丟□伙示永弁旦反厙迕匹五引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "邰菲今木凶⑹綜反敦弇仄引六氏: 丟□伙示永弁旦反厙迕匹五引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Requested action aborted: error in processing"
 msgstr "邰菲今木凶⑹綜毛醱蠅仄引仄凶: 質咥醱卞巨仿□"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "User not local; please try <forward-path>"
 msgstr "交□扒反伕□市伙匹反丐曰引六氏; <forward-path> 毛魂仄化仁分今中"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Requested action not taken: insufficient system storage"
 msgstr "邰菲今木凶⑹綜反敦弇仄引六氏: 扑旦氾丞及忡繡恄啗互簫曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邰菲今木凶丟□伙及⑹綜毛醱蠅仄引仄凶: 恄啗喃曰癲化毛旋尹引仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: 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:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "丟□伙及じ恘毛釩銨仄引允; <CRLF>.<CRLF> 匹蔽弇仄引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Transaction failed"
 msgstr "質咥反撩ヘ仄引仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "賡渝殺蠶巨仿□: %s: 凶少氏譙抰讀匹反丐曰引六氏"
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "A password transition is needed"
+msgstr "由旦伐□玉及庍凳互优邰匹允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "カ據及优邰卅仄"
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "Authentication mechanism is too weak"
+msgstr "カ據丟市瓦朮丞反尕蝸坌聊亢引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-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 ""
-"仇及左皿扑亦件反域潘及カ據毛銀歹內卞 SMTP 扔□田毛濤糧仄引允. "
-"仇木反凶中化中及 SMTP 扔□田尺濤糧仄化手厭歹卅中反內匹允"
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Encryption required for requested authentication mechanism"
+msgstr "邰菲仄凶カ據丟市瓦朮丞及凶戶卞剪寞祭互优邰匹允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "Temporary authentication failure"
+msgstr "域凜讀卅カ據卞撩ヘ仄引仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "仇及左皿扑亦件反 CRAM-MD5 カ據毛銀勻化 SMTP 扔□田尺濤糧仄引允"
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Authentication required"
+msgstr "カ據毛优邰午仄化中引允"
+
+#: camel/providers/smtp/camel-smtp-transport.c:287
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr "賡渝殺蠶巨仿□: %s: 凶少氏譙抰讀匹反丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:359
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%s %s@%s 及 SMTP 由旦伐□玉毛じ恘仄化仁分今中"
+
+#: camel/providers/smtp/camel-smtp-transport.c:494
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 扔□田 %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 煩苀匹 SMTP 丟□伙毛ミ耨仄引允"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:521
 msgid "Cannot send message: sender address not defined."
 msgstr "丟永本□斥毛霜耨請侳引六氏: 霜耨樊及失玉伊旦互爛聒今木化中引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:528
 msgid "Cannot send message: sender address not valid."
 msgstr "丟永本□斥毛霜耨請侳引六氏: 霜耨樊及失玉伊旦互懇仄仁丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:542
 msgid "Cannot send message: no recipients defined."
 msgstr "丟永本□斥毛霜耨請侳引六氏: 熬耨樊互爛聒今木化中引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:636
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 邰菲及正奶丞失它玄: %s: 譙抰讀匹反丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:655
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO 伊旦禾件旦巨仿□: %s: 譙抰讀匹反丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: 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 "AUTH 邰菲及正奶丞失它玄: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "Bad authentication response from server.\n"
+msgstr "扔□田井日棉啜勻凶カ據殺蠶互丐曰引仄凶\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:785
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 邰菲及正奶丞失它玄: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:804
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM 伊旦禾件旦巨仿□: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 邰菲及正奶丞失它玄: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:848
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO 伊旦禾件旦巨仿□: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 邰菲及正奶丞失它玄: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA 伊旦禾件旦巨仿□: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: 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 ""
 "DATA 霜耨及正奶丞失它玄: 丟永本□斥及蔽弇: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA 伊旦禾件旦巨仿□: 丟永本□斥及蔽弇: %s: 丟□伙反霜耨仄引六氏匹仄凶"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:974
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 邰菲及正奶丞失它玄: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:993
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET 伊旦禾件旦巨仿□: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 邰菲及正奶丞失它玄: %s: 譙抰讀匹反丐曰引六氏"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1035
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT 伊旦禾件旦巨仿□: %s: 譙抰讀匹反丐曰引六氏"
 
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "公及方丹卅丟永本□斥反丐曰引六氏: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "移邂白巧伙母丟□伙皿伕田奶母"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 田奶玄"
@@ -4149,7 +4345,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:115
 msgid "attachment"
 msgstr "驕尥"
 
@@ -4158,11 +4354,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 "驕尥坁伉旦玄井日薊鎗仄凶失奶氾丞毛綽輪仄引允"
@@ -4175,7 +4366,7 @@ msgstr "驕尥及馨笛..."
 msgid "Attach a file to the message"
 msgstr "丟永本□斥尺白央奶伙毛驕尥仄引允"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
 msgid "Attachment"
 msgstr "驕尥"
 
@@ -4197,42 +4388,54 @@ msgstr "MIME 正奶皿:"
 
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Send as:"
-msgstr ""
+msgstr "霜耨燮:"
+
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "失玉伊旦罌及凶戶卞仇仇匹弁伉永弁"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:718
 msgid "From:"
 msgstr "犒請諦:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "失玉伊旦罌及凶戶卞仇仇匹弁伉永弁"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:720
+msgid "Reply-To:"
+msgstr "忒耨燮:"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "仇及丟永本□斥毛霜耨仄凶中褥葭毛じ恘仄引允"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+msgid "Subject:"
+msgstr "瘀抩:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:722
 msgid "To:"
 msgstr "偶燮:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "丟永本□斥及熬潸諦毛じ恘仄引允"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:724
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: 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:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:403
+#: 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."
@@ -4240,15 +4443,7 @@ msgstr ""
 "丟永本□斥及熬潸諦伉旦玄及醱卞蜇木卅中匹, "
 "丟永本□斥及市□示件戊疋□毛熬耨允月失玉伊旦毛じ恘仄引允"
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "瘀抩:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "丟□伙及瘀抩毛じ恘仄引允"
-
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4257,39 +4452,26 @@ msgstr ""
 "踢抩白央奶伙 %s 毛釩仁仇午互請侳引六氏匹仄凶:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "帎抩匹忡繡..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "白央奶伙及忡繡醱卞巨仿□: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "白央奶伙及伕□玉醱卞巨仿□: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "丟永本□斥及庍凳毛忡繡醱..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "丟永本□斥及庍凳毛忡繡..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "'闋副冈' 尺闋副毛忡繡醱卞巨仿□互�戲仄引仄凶: %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:193
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4299,27 +4481,27 @@ msgstr ""
 "\n"
 "庍凳毛忡繡仄引允井?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "白央奶伙毛釩仁"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "公及白央奶伙反繡箕仄引六氏"
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "公木反騷橘及白央奶伙匹反丐曰引六氏"
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "公及白央奶伙反繡箕仄引允互﹞厶心潸曰第チ匹反丐曰引六氏"
 
-#: composer/e-msg-composer.c:1006
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "公及白央奶伙反失弁本旦第チ及方丹卞葦尹引允互﹞open(2) 反撩ヘ仄引仄凶"
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4327,22 +4509,32 @@ msgstr ""
 "白央奶伙反午化手釐五中 (100K 動曉) 匹允\n"
 "呿癲卞公木毛醣じ允月仇午毛侗心引允井?"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "白央奶伙厶慇醱及棉卞巨仿□反�戲仄引仄凶"
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "丟永本□斥毛綜嶽仄引允"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "丟□伙綜嶽它奴件玉它毛綜嶽請侳引六氏匹仄凶"
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution 丟□伙綜嶽及賡渝祭互請侳引六氏"
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolution 弘伙□皿它尼失旦奶□玄"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "失玉伊旦市□玉"
@@ -4351,6 +4543,78 @@ msgstr "失玉伊旦市□玉"
 msgid "calendar information"
 msgstr "市伊件母樹扷"
 
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: 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"
+msgstr "%Y/%m/%d (%a)"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:273
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%Y/%m/%d (%a) %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:282
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M"
+
+#. 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 "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:314
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. 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 "%p %I:%M"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:322
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "撢墊扔穴伉及凶戶及 Evolution 戊件禾□生件玄"
@@ -4629,38 +4893,20 @@ msgstr "漆"
 msgid "<click here to select a date>"
 msgstr "<ざ尥毛薊鎗允月凶戶卞仇仇毛弁伉永弁仄化仁分今中>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "白奴伙正伙□伙毛馨笛"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "白奴伙正伙□伙毛彸螂"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "じ恘"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "請恘"
-
-#: filter/filter-editor.c:456 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 "⑹綜毛綽輪"
 
@@ -4672,7 +4918,7 @@ msgstr ""
 "白巧伙母及薊鎗毛侉木化中引允\n"
 "枑勻化丟□伙毛ミ霜允月肣躲卅白巧伙母毛隙爛仄化仁分今中"
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "白巧伙母毛薊鎗"
 
@@ -4697,60 +4943,46 @@ msgstr ""
 msgid "Test"
 msgstr "氾旦玄"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:598
 msgid "Rule name: "
 msgstr "伙□伙抩: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:602
 msgid "Untitled"
 msgstr "正奶玄伙卅仄"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:618
 msgid "If"
 msgstr "手仄"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:635
 msgid "Execute actions"
 msgstr "慼及橢瘀匹⑹綜毛撢墊:"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:639
 msgid "if all criteria are met"
 msgstr "允屯化及湘賞互寧勻凶凜"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:644
 msgid "if any criteria are met"
 msgstr "中仁勾井及湘賞互寧勻凶凜"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:655
 msgid "Add criterion"
 msgstr "湘賞毛馨笛"
 
-#: filter/filter-rule.c:593
+#: 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 "じ恘"
@@ -4759,319 +4991,345 @@ msgstr "じ恘"
 msgid "Outgoing"
 msgstr "請恘"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "移邂白巧伙母"
 
 #: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "隙爛白巧伙母分仃"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "移邂白巧伙母及末□旦"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "允屯化及肣躲卅伉乒□玄白巧伙母"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "允屯化及伕□市伙午肣躲卅伉乒□玄白巧伙母"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "允屯化及伕□市伙白巧伙母"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "白巧伙母尺戊疋□"
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "熬耨ざ"
+msgid "Attachments"
+msgstr "驕尥"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "霜耨ざ"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "互慼及手及毛殖戈"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "刓蜇"
+msgid "Copy to Folder"
+msgstr "白巧伙母尺戊疋□"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "失玉伊旦尺鱉霜"
+msgid "Date received"
+msgstr "熬耨ざ"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "丟永本□斥呿蟲"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "丟永本□斥目永母"
+msgid "Date sent"
+msgstr "霜耨ざ"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "熬耨仄凶丟永本□斥"
+msgid "Deleted"
+msgstr "綽輪"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "霜耨仄凶丟永本□斥"
+msgid "does not contain"
+msgstr "互慼及手及毛殖引卅中"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "白巧伙母尺啖⑹"
+msgid "does not end with"
+msgstr "互慼及手及匹蔽日卅中"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "熬耨樊"
+msgid "does not exist"
+msgstr "互繡箕仄卅中"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "懇筋刓蜇午域譙"
+msgid "does not sound like"
+msgstr "互慼及手及及方丹匹卅中"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
-msgid "Score"
-msgstr "筏狤"
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "互慼及手及匹銨引日卅中"
+
+#: filter/libfilter-i18n.h:18
+msgid "Do Not Exist"
+msgstr "互繡箕仄卅中"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "旦氾□正旦澀爛"
+msgid "Draft"
+msgstr "闋副"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "末□旦"
+msgid "ends with"
+msgstr "互慼及手及匹蔽歹月"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "隙爛及目永母"
+msgid "Exist"
+msgstr "互繡箕允月"
+
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "互繡箕允月"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "質咥曩鞅"
+msgid "Expression"
+msgstr "刓蜇"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1168
-msgid "Subject"
-msgstr "瘀抩"
+#: filter/libfilter-i18n.h:24
+msgid "Forward to Address"
+msgstr "失玉伊旦尺鱉霜"
+
+#: filter/libfilter-i18n.h:25
+msgid "Important"
+msgstr "褐邰"
+
+#: filter/libfilter-i18n.h:26
+msgid "is"
+msgstr "互慼及手及午域譙允月"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "互慼及手及毛殖戈"
+msgid "is greater than"
+msgstr "互慼及手及方曰釐五中"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "互慼及手及毛殖引卅中"
+msgid "is less than"
+msgstr "互慼及手及方曰凝今中"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "互慼及手及匹蔽日卅中"
+msgid "is not"
+msgstr "互慼及手及匹反卅中"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "互繡箕仄卅中"
+msgid "Mailing list"
+msgstr "丟□伉件弘伉旦玄"
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "互慼及手及及方丹匹卅中"
+msgid "Message Body"
+msgstr "丟永本□斥呿蟲"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "互慼及手及匹銨引日卅中"
+msgid "Message Header"
+msgstr "丟永本□斥目永母"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "互慼及手及匹蔽歹月"
+msgid "Message was received"
+msgstr "熬耨仄凶丟永本□斥"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "互繡箕允月"
+msgid "Message was sent"
+msgstr "霜耨仄凶丟永本□斥"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "互慼及手及方曰釐五中"
+msgid "Move to Folder"
+msgstr "白巧伙母尺啖⑹"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "互慼及手及方曰凝今中"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "互慼及手及匹反卅中"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "互慼及手及午域譙允月"
+msgid "Read"
+msgstr "湃厶"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
+msgid "Recipients"
+msgstr "熬耨樊"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+msgid "Regex Match"
+msgstr "懇筋刓蜇午域譙"
 
 #: filter/libfilter-i18n.h:41
+msgid "Replied to"
+msgstr ""
+
+#: 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:44
+msgid "Set Status"
+msgstr "旦氾□正旦澀爛"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "互慼及手及及方丹卞葦尹月"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+msgid "Specific header"
+msgstr "隙爛及目永母"
+
+#: filter/libfilter-i18n.h:47
 msgid "starts with"
 msgstr "互慼及手及匹釩銨允月"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:49
+msgid "Stop Processing"
+msgstr "質咥曩鞅"
+
+#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+msgid "Subject"
+msgstr "瘀抩"
+
+#: filter/libfilter-i18n.h:51
 msgid "was after"
 msgstr "互慼及手及方曰詨"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:52
 msgid "was before"
 msgstr "互慼及手及方曰蟆"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "伙□伙毛馨笛"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "旦戊失伙□伙及彸螂"
+#: filter/score-editor.c:126
+msgid "Score Rules"
+msgstr "旦戊失伙□伙"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "移邂白巧伙母伙□伙及馨笛"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "移邂白巧伙母伙□伙及彸螂"
-
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:219 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "仍心冈"
-
-#: mail/component-factory.c:305
+#: mail/component-factory.c:319
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution 丟□伙戊件禾□生件玄及賡渝祭互請侳引六氏"
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:392
 msgid "Cannot register storage with shell"
 msgstr "扑尼伙匹旦玄伊□斥毛瓚狤請侳引六氏"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "呿蟲引凶反瘀抩互慼及手及毛殖戈"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "呿蟲互慼及手及毛殖戈"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "瘀抩互慼及手及毛殖戈"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "呿蟲互慼及手及毛殖引卅中"
+#: mail/folder-browser-factory.c:244
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" 及皿伕由氾奴"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "瘀抩互慼及手及毛殖引卅中"
+#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "皿伕由氾奴"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "霜耨樊互慼及手及毛殖戈"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr ""
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:510
 msgid "VFolder on Subject"
 msgstr "瘀抩及移邂白巧伙母"
 
-#: mail/folder-browser.c:657
+#: mail/folder-browser.c:513
 msgid "VFolder on Sender"
 msgstr "霜耨樊及移邂白巧伙母"
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:516
 msgid "VFolder on Recipients"
 msgstr "熬耨樊及移邂白巧伙母"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:519 mail/folder-browser.c:710
+msgid "VFolder on Mailing List"
+msgstr "丟□伉件弘伉旦玄及移邂白巧伙母"
+
+#: mail/folder-browser.c:525
 msgid "Filter on Subject"
 msgstr "瘀抩及白奴伙正"
 
-#: mail/folder-browser.c:661
+#: mail/folder-browser.c:528
 msgid "Filter on Sender"
 msgstr "霜耨樊及白奴伙正"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:531
 msgid "Filter on Recipients"
 msgstr "熬耨樊及白奴伙正"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
+#: mail/folder-browser.c:534 mail/folder-browser.c:709
 msgid "Filter on Mailing List"
 msgstr "丟□伉件弘伉旦玄及白奴伙正"
 
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "釩仁"
+#: mail/folder-browser.c:545
+msgid "Resend"
+msgstr "瘋霜耨"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:547
 msgid "Save As..."
 msgstr "帎抩匹忡繡..."
 
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 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:674
+#: mail/folder-browser.c:554
 msgid "Reply to Sender"
 msgstr "霜耨樊尺忒耨"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: 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:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
 msgid "Forward"
 msgstr "鱉霜"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:560
 msgid "Forward inline"
 msgstr "奶件仿奶件匹鱉霜"
 
-#: mail/folder-browser.c:679
+#: mail/folder-browser.c:563
 msgid "Mark as Read"
 msgstr "湃厶午仄化穴□弁"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:565
 msgid "Mark as Unread"
 msgstr "怳厶午仄化穴□弁"
 
-#: mail/folder-browser.c:682
+#: mail/folder-browser.c:570
 msgid "Move to Folder..."
 msgstr "白巧伙母尺啖⑹..."
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:572
 msgid "Copy to Folder..."
 msgstr "白巧伙母尺戊疋□..."
 
-#: mail/folder-browser.c:685
+#: mail/folder-browser.c:576
 msgid "Undelete"
 msgstr "綽輪潸壅"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:586
 msgid "Apply Filters"
 msgstr "白奴伙正贗迕"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:590
 msgid "Create Rule From Message"
 msgstr "丟永本□斥井日伙□伙毛綜嶽"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:712
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "丟□伉件弘伉旦玄及白奴伙正 (%s)"
 
+#: mail/folder-browser.c:713
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "丟□伉件弘伉旦玄及移邂白巧伙母 (%s)"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "丟□伙毛健丹凶戶及 Evolution 戊件禾□生件玄"
@@ -5104,22 +5362,6 @@ msgstr "Evolution 丟□伙戊件禾□生件玄及凶戶及白央弁玄伉"
 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 "Outlook Express 4 及丟□伙毛 Evolution 卞奶件禾□玄允月白央弁玄伉"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "mbox 毛 Evolution 卞奶件禾□玄允月白央弁玄伉"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express 4 及白央奶伙毛 Evolution 卞奶件禾□玄"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "mbox 白央奶伙毛 Evolution 卞奶件禾□玄"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "蜇箕及忡繡溥摯:"
@@ -5151,25 +5393,24 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "用□玄"
-
-#: mail/mail-accounts.c:115
+#: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (犯白巧伙玄)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+msgid "Are you sure you want to delete this account?"
+msgstr "呿癲卞仇及失市它件玄毛綽輪仄化手方欠仄中匹允井?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+msgid "Are you sure you want to delete this news account?"
+msgstr "呿癲卞 news 失市它件玄毛綽輪仄化手方欠仄中匹允井?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
+#: mail/mail-accounts.c:452
 msgid "Evolution Account Manager"
 msgstr "Evolution 失市它件玄穴生□斥乓"
 
-#: mail/mail-account-editor.c:286
+#: mail/mail-account-editor.c:301
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5178,10 +5419,14 @@ msgstr ""
 "升丹仄化手忡繡仄凶中匹允井?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
+#: mail/mail-account-editor.c:720
 msgid "Evolution Account Editor"
 msgstr "Evolution 失市它件玄巨犯奴正"
 
+#: mail/mail-account-editor.c:741
+msgid "Unspecified"
+msgstr "怳隙爛"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5197,12 +5442,16 @@ msgstr "瘀抩反 %s 匹允"
 msgid "Mail from %s"
 msgstr "%s 井日丟□伙"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 丟□伉件弘伉旦玄"
 
-#: mail/mail-callbacks.c:83
+#: 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"
 "You need to do this before you can send,\n"
@@ -5214,7 +5463,7 @@ msgstr ""
 "优邰互丐曰引允\n"
 "漆澀爛仄引允井?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5222,7 +5471,7 @@ msgstr ""
 "丐卅凶反丟□伙毛綜嶽允月蟆卞褥葭及\n"
 "澀爛毛允月优邰互丐曰引允"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5230,11 +5479,11 @@ msgstr ""
 "丐卅凶反丟□伙毛綜嶽允月蟆卞丟□伙\n"
 "ミ霜及澀爛毛允月优邰互丐曰引允"
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "丟□伙鱉霜丟末永玉及澀爛互丐曰引六氏"
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5242,32 +5491,32 @@ msgstr ""
 "仇及丟永本□斥反瘀抩互丐曰引六氏\n"
 "呿癲卞霜耨仄引允井?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:296
 msgid "You must configure an account before you can send this email."
 msgstr "仇及丟□伙毛霜耨允月蟆卞失市它件玄毛澀爛仄卅仃木壬卅曰引六氏"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:318
 msgid "You must specify recipients in order to send this message."
 msgstr "仇及丟永本□斥毛霜耨允月贗濠卅熬耨樊毛隙爛仄卅仃木壬卅曰引六氏"
 
-#: mail/mail-callbacks.c:571
+#: mail/mail-callbacks.c:583
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:765
 msgid "Forwarded message:\n"
 msgstr "丟永本□斥毛鱉霜:\n"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:868
 msgid "Move message(s) to"
 msgstr "丟永本□斥毛啖⑹仄引允: "
 
-#: mail/mail-callbacks.c:814
+#: mail/mail-callbacks.c:870
 msgid "Copy message(s) to"
 msgstr "丟永本□斥毛戊疋□仄引允: "
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1011
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5275,11 +5524,19 @@ msgstr ""
 "玉仿白玄白巧伙母〇卞忡繡今木凶\n"
 "丟永本□斥分仃毛彸螂允月仇午互請侳引允"
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1048
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"霜耨白巧伙母及丟永本□斥分仃\n"
+"瘋霜耨允月仇午互請侳引允"
+
+#: mail/mail-callbacks.c:1081 mail/mail-display.c:85
 msgid "Overwrite file?"
 msgstr "白央奶伙毛曉踏五仄引允井?"
 
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1085 mail/mail-display.c:89
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5287,15 +5544,15 @@ msgstr ""
 "公及抩蟆及白央奶伙反允匹卞繡箕仄引允\n"
 "曉踏五仄引允井?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1129
 msgid "Save Message As..."
 msgstr "丟永本□斥毛帎抩匹忡繡..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1131
 msgid "Save Messages As..."
 msgstr "丟永本□斥毛帎抩匹忡繡..."
 
-#: mail/mail-callbacks.c:1140
+#: mail/mail-callbacks.c:1245
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5304,38 +5561,30 @@ msgstr ""
 "白奴伙正樹扷及伕□玉醱卞巨仿□:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1294
 msgid "Print Message"
 msgstr "丟永本□斥毛執綬"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1341
 msgid "Printing of message failed"
 msgstr "丟永本□斥及執綬卞撩ヘ仄引仄凶"
 
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "扔□田尺濤糧醱"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-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:4
-msgid "Account Properties"
-msgstr "失市它件玄及皿伕由氾奴"
-
 #: mail/mail-config.glade.h:6
 msgid "Advanced"
 msgstr "曉菟"
@@ -5372,24 +5621,20 @@ msgstr ""
 "\n"
 "\"敦弇\" 毛弁伉永弁仄化澀爛毛忡繡仄化仁分今中"
 
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
 #: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "犯白巧伙玄"
+msgid "De_fault"
+msgstr "犯白巧伙玄(_f)"
 
 #: mail/mail-config.glade.h:22
 msgid "Done"
 msgstr "敦弇"
 
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
 msgstr "丟□伙失玉伊旦:"
 
 #: mail/mail-config.glade.h:25
-msgid "Email Address:"
+msgid "Email address:"
 msgstr "丟□伙失玉伊旦:"
 
 #: mail/mail-config.glade.h:26
@@ -5400,162 +5645,178 @@ msgstr "Evolution 丟□伙澀爛"
 msgid "Full Name:"
 msgstr "白伙生□丞:"
 
-#: mail/mail-config.glade.h:30
+#: 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:31
+#: mail/mail-config.glade.h:32
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config.glade.h:33
 msgid "Identity"
 msgstr "褥葭"
 
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "熬耨丟□伙扔□田"
+#: 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 "Kerberos"
 
-#: 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 "丟□伙澀爛玉伙奶玉"
 
-#: 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:41
-msgid "Miscellaneous"
-msgstr "公及職"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "瓦亙□旦"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Optional"
 msgstr "左皿扑亦件"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Organization:"
 msgstr "賺縞:"
 
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "霜耨丟□伙扔□田"
-
 #: mail/mail-config.glade.h:49
+msgid "PGP binary path:"
+msgstr "PGP 皿伕弘仿丞及由旦:"
+
+#: mail/mail-config.glade.h:50
 msgid "Password:"
 msgstr "由旦伐□玉:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Plain Text"
 msgstr "皿伊奶件氾平旦玄"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Receiving Email"
 msgstr "丟□伙毛熬耨醱"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Remember my password"
 msgstr "仇及由旦伐□玉毛筏盛"
 
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "忒耨燮:"
+#: mail/mail-config.glade.h:56
+msgid "Reply address:"
+msgstr "忒耨失玉伊旦:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Required"
 msgstr "优邰"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Save password"
 msgstr "由旦伐□玉毛忡繡"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
+msgid "Select PGP binary"
+msgstr "PGP 皿伕弘仿丞毛薊鎗"
+
+#: 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
-msgid "Servers"
-msgstr "扔□田"
+#: 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:68
+#: mail/mail-config.glade.h:71
+msgid "Source"
+msgstr "末□旦"
+
+#: mail/mail-config.glade.h:72
 msgid "Sources"
 msgstr "末□旦"
 
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "仇及扔□田反兜蟈卅濤糧 (SSL) 互优邰匹允"
+#: mail/mail-config.glade.h:73
+msgid "Transport"
+msgstr "霜耨"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:74
+msgid "Transport Authentication"
+msgstr "霜耨及カ據"
+
+#: mail/mail-config.glade.h:75
 msgid "Type"
 msgstr "潘帎"
 
-#: mail/mail-config.glade.h:71
+#: 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 ""
 "公木日及扔□田毛輔寰仄凶中抩蟆及潘帎匹允. 拺尹壬: \"酷儀\" 丐月中反 \"笮\""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:77
 msgid "User Information"
 msgstr "交□扒樹扷"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:78
 msgid "Username:"
 msgstr "交□扒抩:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:79
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5565,11 +5826,17 @@ msgstr ""
 "\n"
 "\"慼\" 毛弁伉永弁仄化銨戶化仁分今中"
 
-#: mail/mail-config.glade.h:78
+#: 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:85
 msgid "minutes."
 msgstr "坌"
 
-#: mail/mail-config-druid.c:399
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5578,11 +5845,11 @@ msgstr ""
 "じ恘及丟□伙澀爛及割カ卞撩ヘ仄引仄凶\n"
 "%s 井日丐卅凶及丟□伙毛潸丿醱卞杽鎖毛�葦仄凶第チ嶺互丐曰引允"
 
-#: mail/mail-config-druid.c:489
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "抩蟆塢棉:"
 
-#: mail/mail-config-druid.c:677
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5592,147 +5859,160 @@ msgstr ""
 "%s 毛銀勻化丐卅凶及丟□伙毛霜耨醱卞杽鎖毛�葦仄凶第チ嶺互丐曰引允"
 
 #. set window title
-#: mail/mail-config-druid.c:1036
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution 失市它件玄它奴扒□玉"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:191
 msgid "Save Attachment"
 msgstr "驕尥及忡繡"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:231
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "綜僅犯奴伊弁玄伉毛綜嶽請侳引六氏匹仄凶: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:292
 msgid "Save to Disk..."
 msgstr "犯奴旦弁尺忡繡..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:294
 #, c-format
 msgid "Open in %s..."
 msgstr "%s 卞釩仁..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:296
 msgid "View Inline"
 msgstr "奶件仿奶件刓憎"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:325
 msgid "External Viewer"
 msgstr "陸朿申亙□失"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:348
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "奶件仿奶件刓憎 (%s煩苀)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:352
 msgid "Hide"
 msgstr "悵允"
 
+#: mail/mail-display.c:1073
+msgid "Add to addressbook (FIXME)"
+msgstr "失玉伊旦罌尺馨笛 (FIXME)"
+
+#: mail/mail-display.c:1075
+msgid "Open in addressbook (FIXME)"
+msgstr "失玉伊旦罌毛釩仁 (FIXME)"
+
+#: mail/mail-display.c:1082
+msgid "Open link in browser (FIXME)"
+msgstr "皮仿它扒匹伉件弁毛釩仁 (FIXME)"
+
+#: mail/mail-display.c:1084
+msgid "Save as (FIXME)"
+msgstr "帎抩匹忡繡 (FIXME)"
+
+#: mail/mail-display.c:1086
+msgid "Copy location (FIXME)"
+msgstr "樺赭毛戊疋□ (FIXME)"
+
 #: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s 毛驕尥"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:745
 msgid "Loading message content"
 msgstr "丟永本□斥及〇芢毛厶心慇心醱"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:1034
 msgid "Encrypted message not displayed"
 msgstr "剪寞祭今木凶丟永本□斥反刓憎仄引六氏"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:1040
 msgid "Encrypted message"
 msgstr "剪寞祭今木凶丟永本□斥"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1041
 msgid "Click icon to decrypt."
 msgstr "失奶戊件毛弁伉永弁仄化汊寞祭仄化仁分今中"
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
+#: mail/mail-format.c:1110 mail/mail-format.c:1497
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "仇及丟永本□斥反犯斥正伙踢抩今木耨俇匹五月手及匹允"
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
+#: mail/mail-format.c:1118 mail/mail-format.c:1505
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "仇及丟永本□斥反犯斥正伙踢抩今木凶手及匹允互, 耨俇毛據抸請侳引六氏"
 
-#: mail/mail-format.c:1611
+#: mail/mail-format.c:1718
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 扔奶玄 (%s) 毛隙仄化中引允"
 
-#: mail/mail-format.c:1623
+#: mail/mail-format.c:1730
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1734
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "伕□市伙白央奶伙 (%s) 毛隙仄化中引允"
 
-#: mail/mail-format.c:1661
+#: mail/mail-format.c:1768
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "怳襞及陸朿犯□正 (\"%s\" 正奶皿) 毛隙仄化中引允"
 
-#: mail/mail-format.c:1666
+#: mail/mail-format.c:1773
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "伕□市伙白巧伙母毛瓚狤醱"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "伕□市伙白巧伙母毛瓚狤仄引允"
+#: mail/mail-local.c:335
+#, c-format
+msgid "No such folder %s"
+msgstr "公及方丹卅白巧伙母 %s 反丐曰引六氏"
 
-#: mail/mail-local.c:553
+#: mail/mail-local.c:508
 #, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"白巧伙母 '%s' 毛瓚狤允月仇午互請侳引六氏:\n"
-"%s"
+msgid "Opening '%s'"
+msgstr "'%s' 毛左□皿件醱"
 
-#: mail/mail-local.c:717
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "白巧伙母 \"%s\" 毛 \"%s\" 溥摯尺庍凳仄化中引允"
 
-#: mail/mail-local.c:721
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "白巧伙母 \"%s\" 毛 \"%s\" 溥摯尺庍凳仄引允"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "白巧伙母及瘋厭嶽醱"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:781
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "蜇箕及白巧伙母毛弁伕□朮醱"
 
-#: mail/mail-local.c:813
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "衙中白巧伙母毛伉生□丞仄化左□皿件醱"
 
-#: mail/mail-local.c:831
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "蕙筋白巧伙母毛綜嶽醱"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "丟永本□斥毛戊疋□醱"
 
-#: mail/mail-local.c:866
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5741,13 +6021,13 @@ msgstr ""
 "白巧伙母及丟正樹扷毛忡繡請侳引六氏; 手反支仇及白巧伙母毛釩仁\n"
 "仇午互請侳卅中午凶少氏竣勿中凶及匹仄斤丹: %s"
 
-#: mail/mail-local.c:898
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:88
+#: mail/mail-mt.c:181
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5756,7 +6036,7 @@ msgstr ""
 "'%s' 及端卞巨仿□互�戲仄引仄凶:\n"
 "%s"
 
-#: mail/mail-mt.c:90
+#: mail/mail-mt.c:183
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5765,118 +6045,96 @@ msgstr ""
 "醜綜及賞ɛ仄化中月棉卞巨仿□互�戲仄引仄凶:\n"
 "%s"
 
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
+#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
 msgid "Working"
 msgstr "綜僅醱"
 
-#: mail/mail-ops.c:519
+#: mail/mail-mt.c:670 mail/session.c:91
+msgid "Do you accept?"
+msgstr "噩カ仄引允井?"
+
+#: mail/mail-mt.c:864
+msgid "Evolution progress"
+msgstr "Evolution 褡墊"
+
+#: mail/mail-ops.c:518
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" 毛霜耨醱"
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:520
 msgid "Sending message"
 msgstr "丟永本□斥毛霜耨醱"
 
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "\"%s\" 毛馨笛醱"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "瘀抩卅仄及丟永本□斥毛尥笛"
-
-#: mail/mail-ops.c:841
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "\"%s\" 井日 \"%s\" 及醱尺丟永本□斥毛啖⑹醱"
+#: mail/mail-ops.c:751
+msgid "Saving message to folder"
+msgstr "白巧伙母尺丟永本□斥毛忡繡醱"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:824
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "\"%s\" 井日 \"%s\" 及醱尺丟永本□斥毛戊疋□醱"
+msgid "Moving messages to %s"
+msgstr "%s 尺丟永本□斥毛啖⑹醱"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:824
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "\"%s\" 井日 \"%s\" 及醱尺丟永本□斥毛啖⑹"
+msgid "Copying messages to %s"
+msgstr "%s 尺丟永本□斥毛戊疋□醱"
 
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "\"%s\" 井日 \"%s\" 及醱尺丟永本□斥毛戊疋□"
-
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:841
 msgid "Moving"
 msgstr "啖⑹醱"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:844
 msgid "Copying"
 msgstr "戊疋□醱"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:855
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "丟永本□斥毛 %s %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:977
+#: mail/mail-ops.c:926
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" 及醱及白巧伙母毛雖犖醱"
 
-#: mail/mail-ops.c:1089
+#: mail/mail-ops.c:1084
 msgid "Forwarded messages"
 msgstr "丟永本□斥毛鱉霜"
 
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
 #, c-format
 msgid "Opening folder %s"
 msgstr "\"%s\" 及醱及白巧伙母毛左□皿件醱"
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1192
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1376
+#: mail/mail-ops.c:1379
 msgid "Expunging folder"
 msgstr "白巧伙母毛綽輪醱"
 
-#: mail/mail-ops.c:1425
+#: mail/mail-ops.c:1428
 #, c-format
 msgid "Retrieving message %s"
 msgstr "丟永本□斥 %s 毛潸丿醱"
 
-#: mail/mail-ops.c:1492
+#: mail/mail-ops.c:1495
 msgid "Retrieving messages"
 msgstr "丟永本□斥毛潸丿醱"
 
-#: mail/mail-ops.c:1502
+#: mail/mail-ops.c:1505
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "丟永本□斥⺀寞 %d / %d (uid \"%s\") 毛潸丿醱"
 
-#: mail/mail-ops.c:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "%s 及仍心冈白巧伙母毛左□皿件醱"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s 白巧伙母 (%s 迕) 毛伕□玉醱"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s 白巧伙母 (%s 迕) 毛伕□玉"
-
-#: mail/mail-ops.c:1969
+#: mail/mail-ops.c:1579
 msgid "Saving messages"
 msgstr "丟永本□斥毛忡繡醱"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:1658
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5885,12 +6143,12 @@ msgstr ""
 "請恘白央奶伙毛綜嶽請侳引六氏: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:1671
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "丟永本□斥 %d / %d (uid \"%s\") 毛忡繡醱"
 
-#: mail/mail-ops.c:2075
+#: mail/mail-ops.c:1685
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5899,11 +6157,11 @@ msgstr ""
 "白央奶伙及忡繡醱卞巨仿□: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:1759
 msgid "Saving attachment"
 msgstr "驕尥毛忡繡醱"
 
-#: mail/mail-ops.c:2164
+#: mail/mail-ops.c:1774
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5912,7 +6170,7 @@ msgstr ""
 "請恘白央奶伙毛綜嶽請侳引六氏: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2192
+#: mail/mail-ops.c:1802
 #, c-format
 msgid "Could not write data: %s"
 msgstr "犯□正毛踏五請允仇午互請侳引六氏匹仄凶: %s"
@@ -5921,135 +6179,101 @@ msgstr "犯□正毛踏五請允仇午互請侳引六氏匹仄凶: %s"
 msgid "_Search"
 msgstr "腹綢(_S)"
 
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr "平乓件本伙醱 ..."
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr "丟□伙及霜熬耨"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr "熬耨醱"
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr "凳蕙醱 ..."
 
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr "謹窗醱 ..."
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr "霜耨醱"
 
-#: mail/mail-send-recv.c:483
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "平乓件本伙仄引仄凶"
 
-#: mail/mail-send-recv.c:487
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "敦弇仄引仄凶"
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
+#: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "由奶皿曉卞尕敦蟈卅丟永本□斥互踏井木引仄凶!"
 
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"%s 尺賞ɛ仄化中月棉卞巨仿□互�戲仄引仄凶:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"`%s' 及端卞巨仿□互�戲仄引仄凶:\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "ネ葛今木凶旦伊永玉井日戊穴件玉厶心慇心醱卞巨仿□互�戲仄引仄凶"
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "ネ葛今木凶旦伊永玉井日尕懇卅丟永本□斥?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "母奶失伕弘示永弁旦毛綜嶽允月仇午互請侳引六氏匹仄凶"
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "交□扒反弁巨伉毛平乓件本伙仄引仄凶"
-
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "氾件禾仿伉 mbox '%s' 毛綜嶽匹五引六氏匹仄凶: %s"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (丟永本□斥毛鱉霜)"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (瘀抩卅仄)"
 
-#: mail/mail-tools.c:283
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "丟永本□斥毛鱉霜仄引仄凶 - %s"
 
-#: mail/mail-tools.c:285
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "丟永本□斥毛鱉霜仄引仄凶 (瘀抩卅仄)"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"`%s' 及樺赭毛釩仁仇午互請侳引六氏:\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "移邂白巧伙母"
 
-#: mail/mail-vfolder.c:303
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 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:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
 msgid "Reply"
 msgstr "忒耨"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: 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:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "仇及丟永本□斥及熬潸諦蟈夠尺忒耨仄引允"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
 msgid "Forward this message"
 msgstr "仇及丟永本□斥毛鱉霜仄引允"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
 msgid "Print the selected message"
 msgstr "薊鎗今木凶丟永本□斥毛執綬仄引允"
 
@@ -6057,164 +6281,150 @@ msgstr "薊鎗今木凶丟永本□斥毛執綬仄引允"
 msgid "Delete this message"
 msgstr "仇及丟永本□斥毛綽輪仄引允"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:614
 msgid "Unseen"
 msgstr "怳厶"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:615
 msgid "Seen"
 msgstr "湃厶"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:616
 msgid "Answered"
 msgstr "忒蠶碧心"
 
-#: mail/message-list.c:627
+#: 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:948
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %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:960 mail/message-list.c:976
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:623
+msgid "Lower"
+msgstr "斕中"
 
-#: mail/message-list.c:963 mail/message-list.c:979
-msgid "<unknown>"
-msgstr "<怳襞>"
+#: mail/message-list.c:627
+msgid "Higher"
+msgstr "嫖中"
 
-#: mail/message-list.c:1031
+#: mail/message-list.c:628
+msgid "Highest"
+msgstr "瘉手嫖中"
+
+#: mail/message-list.c:878
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1038
+#: mail/message-list.c:885
 msgid "Today %l:%M %p"
 msgstr "漆ざ及 %p %l:%M"
 
-#: mail/message-list.c:1047
+#: mail/message-list.c:894
 msgid "Yesterday %l:%M %p"
 msgstr "緊ざ及 %p %l:%M"
 
-#: mail/message-list.c:1059
+#: mail/message-list.c:906
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:914
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %p %l:%M"
+msgstr "%m畸 %dざ %p %l:%M"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:916
 msgid "%b %d %Y"
-msgstr "%Y %b %d"
+msgstr "%Yコ %m畸 %dざ"
 
-#: mail/message-list.c:1167
+#: mail/message-list.c:1014
 msgid "Flagged"
 msgstr "白仿弘"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "From"
 msgstr "犒請諦"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "Date"
 msgstr "ざ尥"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1016
 msgid "To"
 msgstr "偶燮"
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1016
 msgid "Size"
 msgstr "扔奶朮"
 
-#: mail/openpgp-utils.c:77
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "丐卅凶及 %s 由旦白伊□朮 ( %s 迕) 毛じ恘仄化仁分今中"
 
-#: mail/openpgp-utils.c:80
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "丐卅凶及 %s 由旦白伊□朮毛じ恘仄化仁分今中"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP 皿伕弘仿丞反厙迕匹五引六氏"
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "羼間今木凶由旦伐□玉反丐曰引六氏"
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP 尺及由奶皿互綜嶽匹五引六氏匹仄凶: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr "熬耨樊互隙爛今木化中引六氏"
 
-#: mail/openpgp-utils.c:1060
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "綜僅白央奶伙毛綜嶽允月仇午互請侳引六氏匹仄凶: %s"
 
-#: mail/subscribe-dialog.c:62 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:63
+#: mail/subscribe-dialog.c:74
 msgid "Store"
 msgstr "筏狤"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:156
 msgid "Display folders starting with:"
 msgstr "刓憎允月白巧伙母毛釩銨允月:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:186
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "\"%s\" 及筏狤毛潸丿醱"
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "\"%s\" 及筏狤毛潸丿"
-
-#: mail/subscribe-dialog.c:292
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:296
+#: mail/subscribe-dialog.c:291
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -6231,7 +6441,7 @@ msgstr "白巧伙母毛綜嶽允月樺赭毛隙爛仄化仁分今中:"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
+#: shell/importer/importer.c:157
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6242,7 +6452,7 @@ msgstr ""
 "奶件禾□正及賞ɛ互請侳化中引六氏\n"
 "5卍謹勻化瘋蘸魂仄化仁分今中"
 
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6251,7 +6461,7 @@ msgstr ""
 "%s 毛奶件禾□玄醱\n"
 "失奶氾丞 %d 毛奶件禾□玄醱"
 
-#: shell/importer/importer.c:307
+#: shell/importer/importer.c:309
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6260,11 +6470,11 @@ msgstr ""
 "健丹仇午互請侳月奶件禾□玄互丐曰引六氏\n"
 "%s"
 
-#: shell/importer/importer.c:317
+#: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "奶件禾□玄醱"
 
-#: shell/importer/importer.c:325
+#: shell/importer/importer.c:327
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6273,12 +6483,12 @@ msgstr ""
 "%s 毛奶件禾□玄醱\n"
 "%s 毛釩銨仄引允"
 
-#: shell/importer/importer.c:340
+#: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
 msgstr "%s 及伕□玉醱卞巨仿□"
 
-#: shell/importer/importer.c:355
+#: shell/importer/importer.c:357
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6287,27 +6497,27 @@ msgstr ""
 "%s 毛奶件禾□玄醱\n"
 "失奶氾丞 1 毛奶件禾□玄醱"
 
-#: shell/importer/importer.c:426
+#: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "憤⑸"
 
-#: shell/importer/importer.c:476
+#: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "白央奶伙抩:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "白央奶伙毛薊鎗"
 
-#: shell/importer/importer.c:491
+#: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "白央奶伙潘帎:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "奶件禾□玄"
 
-#: shell/importer/importer.c:605
+#: shell/importer/importer.c:609
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -6336,6 +6546,9 @@ msgid ""
 "With this wizard you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
+"方丹仇公, Evolution 奶件禾□玄交□氾奴伉氾奴尺\n"
+"仇及它奴扒□玉匹反 Evolution 及醱卞陸朿白央奶伙毛奶件禾□玄\n"
+"允月質咥毛騷仄化副〇仄引允"
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -6445,19 +6658,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 反丐卅凶及 $PATH 卞反葦勾井曰引六氏"
 
-#: 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 "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: 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"
@@ -6469,7 +6682,7 @@ msgstr ""
 "弘伙□皿它尼失失皿伉弗□扑亦件及\n"
 "由永弗□斥末白玄匹允"
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:361
 msgid "Go to folder..."
 msgstr "白巧伙母尺啖⑹..."
 
@@ -6496,7 +6709,7 @@ msgstr "%s - Evolution %s [%s]"
 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"
@@ -6582,61 +6795,61 @@ msgstr "扑亦□玄市永玄田□井日仇及扑亦□玄市永玄毛綽輪仄引允"
 msgid "Error saving shortcuts."
 msgstr "扑亦□玄市永玄及忡繡醱卞巨仿□互�戲仄引仄凶"
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:649 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:345
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "薊鎗今木凶白巧伙母毛刓憎仄引允"
 
-#: shell/e-storage.c:160
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(抩蟆卅仄)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "巨仿□反丐曰引六氏"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "域�讀卅巨仿□"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "⑺元抩蟆及白巧伙母互允匹卞繡箕仄化中引允"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "隙爛今木凶白巧伙母潘帎反肣躲匹反丐曰引六氏"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "I/O 巨仿□"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "白巧伙母毛綜嶽允月蝸坌卅塢五互丐曰引六氏"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "隙爛今木凶白巧伙母反葦尥井曰引六氏匹仄凶"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "窗チ反仇及筏盛隸譆匹反撢隸今木化中引六氏"
 
-#: shell/e-storage.c:427
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "袱第互丐曰引六氏"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "醜綜反扔禾□玄今木化中引六氏"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "隙爛今木凶潘帎反仇及筏盛隸譆匹反扔禾□玄今木化中引六氏"
 
@@ -6644,49 +6857,43 @@ msgstr "隙爛今木凶潘帎反仇及筏盛隸譆匹反扔禾□玄今木化中引六氏"
 msgid "The Evolution shell."
 msgstr "Evolution 扑尼伙"
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
-"支丐﹞Evolution 弘伙□皿它尼失旦奶□玄及仇及 preview release 及\n"
+"支丐﹞Evolution 弘伙□皿它尼失旦奶□玄及仇及 PREVIEW RELEASE 及\n"
 "母它件伕□玉卞凜棉毛喃中化仁木化丐曰互午丹\n"
 "\n"
-"聊蛔及伉伉□旦井日及棉﹞脫★及學鰾反 Evolution 毛肣迕卞允月仇午卞\n"
-"勾中化匹仄凶‘Evolution 釩�樊及聶仁反白伙正奶丞匹⺝日及丟□伙\n"
-"毛厶戈凶戶卞漆 Evolution 毛銀勻化中引允‘丐卅凶手請侳引仄凶‘\n"
-"(优內田永弁失永皿毛忡儅仄化仁分今中)\n"
+"Evolution 反怳敦嶽匹允. 公木反嗤尥中化中引允互, 冂藹互卅中井綜僅\n"
+"籣醱及赭互丐月午中丹仇午匹允. 手仄窒井毛允月杅芊毛閤中尥仁仇午互\n"
+"請侳卅中卅日壬, 凶少氏引分公木毛允月杅芊互卅中凶戶匹允! :)\n"
 "\n"
-"仄井仄脫★互公及兜爛嶺午本平亙伉氾奴卞排黍毛芨尹化中月聶仁及田弘\n"
-"毛膜懇仄凶棉卞﹞丐卅凶反引分蠅曰踏五毛熬仃潸曰引允: Evolution 反:\n"
-"弁仿永扑亙仄凶曰﹞丐卅凶互公丹侗引卅仁午手丟□伙毛妎撩仄凶曰﹞\n"
-"丐卅凶互侗氏匹手丟□伙及綽輪毛蛐⺍仄凶曰﹞凜濯皿伕本旦互⑹綜仄凶\n"
-"引引及橇謫卞卅勻凶曰﹞100% 及 CPU 由伐□毛壅⻣仄凶曰﹞午化手簧仁\n"
-"⑹中凶曰﹞伕永弁仄凶曰﹞エ啦及丟□伉件弘伉旦玄卞 HTML 丟□伙毛\n"
-"霜勻凶曰﹞公仄化丐卅凶及竻諦午酷儀醮棉及蟆匹丐卅凶毛漱日六月\n"
-"匹仄斤丹‘\n"
-"丐仁引匹濩抸踏卞蝨勻化云銀中仁分今中‘\n"
+"脫★反 Evolution 互肣迕卅手及卞卅月仇午毛侗氏匹中引允互, 引分慼\n"
+"及仇午卞覆仄化鏜啦允月优邰互丐月方丹卞普元引允: 弁仿永扑亙仄凶曰\n"
+"丟□伙毛妎撩仄凶曰, ⑹綜仄凶皿伕本旦互酸勻凶曰, CPU 由伐□毛 100%\n"
+"壅⻣仄凶曰, 扔□田尺覆殺仄化中卅中戊穴件玉毛霜耨仄化, 丐卅凶及\n"
+"竻諦支酷儀醮棉及蟆匹漱日六凶曰允月井手仄木引六氏.\n"
 "\n"
 "脫★反丐卅凶互脫★及嶽絆毛啼仄戈仇午毛侗氏匹中引允‘公仄化脫★反\n"
 "ゲ艘卞丐卅凶及塽艇毛謹切熬仃化中引允!\n"
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6694,15 +6901,15 @@ msgstr ""
 "丐曰互午丹\n"
 "Evolution 民□丞\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution 扑尼伙及賡渝祭互請侳引六氏"
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "拑躲"
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo 戊件禾□生件玄扑旦氾丞毛賡渝祭請侳引六氏"
 
@@ -6726,40 +6933,51 @@ msgstr "戊件正弁玄毛腹綢仄引允"
 msgid "New contact"
 msgstr "蕙筋戊件正弁玄"
 
-#: ui/evolution-addressbook.xml.h:9
+#: 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 "執綬今木月丟永本□斥及皿伊申亙□毛刓憎仄引允"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "戊件正弁玄毛執綬仄引允"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
 msgid "Stop"
 msgstr "曩鞅"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "敏心慇心毛曩鞅仄引允"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "允屯化刓憎"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "允屯化及戊件正弁玄毛刓憎仄引允"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "失玉伊旦罌及澀爛(_A)..."
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
+msgstr "失玉伊旦罌及末□旦(_A)..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "戊件正弁玄及執綬(_P)..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
+msgstr "戊件正弁玄(_C)"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "執綬(_P)..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "戊件正弁玄及腹綢(_S)"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: 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)"
 
@@ -6771,26 +6989,26 @@ msgstr "5 ざ"
 msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "市伊件母(_l)"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
+msgstr "蕙筋卞咍ざ及奶矛件玄毛綜嶽仄引允"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "市伊件母及澀爛..."
-
-#: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
 msgstr "蕙筋沶竄毛綜嶽仄引允"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "蕙筋市伊件母毛綜嶽仄引允"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "ざ"
 
+#: ui/evolution-calendar.xml.h:8
+msgid "Go To"
+msgstr "啖⑹"
+
 #: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "凜棉毛枑仄引允"
@@ -6800,91 +7018,117 @@ msgid "Go forward in time"
 msgstr "凜棉毛褡戶引允"
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "啖⑹"
+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:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "蜇箕及凜棉尺啖⑹仄引允"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "畸"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "蕙筋沶竄"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr "蕙筋奶矛件玄(_E)"
 
-#: ui/evolution-calendar.xml.h:16 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:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "市伊件母毛釩仁"
 
-#: ui/evolution-calendar.xml.h:19
+#: 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:26
 msgid "Print this Calendar"
 msgstr "仇及市伊件母及執綬仄引允"
 
-#: ui/evolution-calendar.xml.h:22 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:23
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr "帎及手及午仄化市伊件母毛忡繡仄引允"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "1 ざ毛刓憎"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "1 仳畸毛刓憎"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "1 蔥棉毛刓憎"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "蔥洢⑸凜棉毛刓憎"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: 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:29
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
+msgstr "酷儀及蔥(_o)"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "蔥"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-calendar.xml.h:37
+msgid "_Appointment"
+msgstr "沶竄(_A)"
+
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
+msgstr "ざ(_D)"
+
+#: 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:31
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "市伊件母毛釩仁(_O)"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "仇及市伊件母及執綬(_P)"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: 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 "仇及失奶氾丞毛綽輪仄引允"
@@ -6907,7 +7151,7 @@ msgid "Print this item"
 msgstr "仇及失奶氾丞毛執綬"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: 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 "執綬..."
 
@@ -6928,7 +7172,7 @@ msgstr "戊件正弁玄毛忡繡仄化仇及母奶失伕弘示永弁旦毛岉元引允"
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
-msgstr ""
+msgstr "職尺戊件正弁玄毛霜耨(_n)..."
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
@@ -6936,20 +7180,16 @@ msgstr "左件仿奶件目伙皿毛輔寰仄化仁分今中"
 
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
-msgstr ""
+msgstr "戊件正弁玄尺丟永本□斥毛霜耨(_m)..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: 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:15
-msgid "_Print..."
-msgstr "執綬(_P)..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "忡繡(_S)"
@@ -7015,6 +7255,10 @@ msgstr "濠曰潸曰"
 msgid "Cut the selection"
 msgstr "薊鎗今木凶手及毛濠曰潸曰引允"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "仇及沶竄毛綽輪"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "XML及母件皿"
@@ -7083,12 +7327,8 @@ msgstr "皿伉件正及澀爛(_e)..."
 msgid "Print Setup"
 msgstr "皿伉件正及澀爛"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "皿伕由氾奴"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "忡繡"
 
@@ -7101,10 +7341,6 @@ msgstr "沶竄毛忡繡仄化母奶失伕弘示永弁旦毛岉元引允"
 msgid "Save the current file"
 msgstr "蜇箕及白央奶伙毛忡繡仄引允"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "藉寧六及旦弗斥亙□伙"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "藉寧六及旦弗斥亙□伙(_M)"
@@ -7129,18 +7365,18 @@ msgstr "蜇箕及皿伉件正及矢□斥澀爛毛墊中引允"
 msgid "Task _Request (FIXME)"
 msgstr "正旦弁邰菲(_R) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: 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:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: 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:29
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "戊件正弁玄(_C) (FIXME)"
 
@@ -7148,18 +7384,12 @@ msgstr "戊件正弁玄(_C) (FIXME)"
 msgid "_Copy"
 msgstr "戊疋□(_C)"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: 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:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "彸螂(_E)"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
+#: 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)"
@@ -7197,7 +7427,8 @@ msgstr "鬚曰尥仃(_P)"
 msgid "_Print"
 msgstr "執綬(_P)"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: 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)..."
 
@@ -7206,7 +7437,7 @@ msgid "_Select All"
 msgstr "允屯化薊鎗(_A)"
 
 #: 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) (FIXME)"
 
@@ -7247,193 +7478,229 @@ msgid "Copy message to a new folder"
 msgstr "丟永本□斥毛蕙筋白巧伙母尺戊疋□仄引允"
 
 #: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "伙□伙毛綜嶽"
+msgid "Create _Virtual Folder From Message"
+msgstr "丟永本□斥井日移邂白巧伙母毛綜嶽(_V)"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "白巧伙母(_o)"
+#: ui/evolution-mail.xml.h:8
+msgid "Display all of the message headers"
+msgstr "允屯化及丟永本□斥目永母毛刓憎仄引允"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "霜耨樊及白奴伙正(_l)"
+msgid "Empty _Trash"
+msgstr "打立冈毛塢卞允月(_T)"
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "熬耨樊及白奴伙正(_i)"
+msgid "Filter on Se_nder"
+msgstr "霜耨樊及白奴伙正(_n)"
 
 #: ui/evolution-mail.xml.h:11
+msgid "Filter on _Recipients"
+msgstr "熬耨樊及白奴伙正(_R)"
+
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Subject"
+msgstr "瘀抩及白奴伙正(_S)"
+
+#: ui/evolution-mail.xml.h:13
 msgid "Forget _Passwords"
 msgstr "由旦伐□玉及妎撩(_P)"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "丟□伙潸丿"
+msgid "Forward As"
+msgstr "鱉霜"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:17
+msgid "Full _Headers"
+msgstr "允屯化及目永母(_H)"
+
+#: ui/evolution-mail.xml.h:18
 msgid "Hide S_elected Messages"
 msgstr "薊鎗今木凶丟永本□斥毛悵允(_e)"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:19
 msgid "Hide _Deleted Messages"
 msgstr "綽輪今木凶丟永本□斥毛悵允(_D)"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Read messages"
 msgstr "湃厶丟永本□斥毛悵允(_R)"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "丟□伙白奴伙正(_F)..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "爛渝壽厶棟咥..."
-
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "湃厶午仄化穴□弁(_k)"
+msgid "Manage _Subscriptions..."
+msgstr "爛渝壽厶棟咥(_S)..."
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "怳厶午仄化穴□弁(_n)"
+msgid "Mar_k as Read"
+msgstr "湃厶午仄化穴□弁(_k)"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "啖⑹"
+msgid "Mark All as R_ead"
+msgstr "湃厶午仄化允屯化穴□弁(_e)"
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "丟永本□斥毛蕙筋白巧伙母尺啖⑹仄引允"
+msgid "Mark as U_nread"
+msgstr "怳厶午仄化穴□弁(_n)"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "執綬今木月丟永本□斥及皿伊申亙□毛刓憎仄引允"
+msgid "Move"
+msgstr "啖⑹"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "丟永本□斥及執綬皿伊申亙□..."
+#: ui/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr "丟永本□斥毛蕙筋白巧伙母尺啖⑹仄引允"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "丟永本□斥毛皿伉件正尺執綬仄引允"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "丟永本□斥毛執綬..."
-
 #: ui/evolution-mail.xml.h:33
+msgid "Redirect (FIXME: implement me)"
+msgstr "偶抩毛踏五晶尹月 (FIXME: 撢隸仄化仁分今中)"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _All"
 msgstr "蟈夠尺忒耨(_A)"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "霜耨樊尺忒耨(_S)"
-
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:39
 msgid "S_ource"
 msgstr "末□旦(_o)"
 
-#: ui/evolution-mail.xml.h:38 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:39
+#: ui/evolution-mail.xml.h:41
+msgid "Select _Thread"
+msgstr "旦伊永玉毛薊鎗(_T)"
+
+#: ui/evolution-mail.xml.h:42
+msgid "Send / Receive"
+msgstr "霜熬耨"
+
+#: 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:40
-msgid "Show _All Messages"
-msgstr "允屯化及丟永本□斥毛刓憎(_A)"
+#: ui/evolution-mail.xml.h:46
+msgid "Show _All"
+msgstr "允屯化刓憎(_A)"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:48
 msgid "Threaded Message list"
 msgstr "丟永本□斥伉旦玄毛旦伊永玉祭仄引允"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:49
 msgid "VFolder on Se_nder"
 msgstr "霜耨樊及移邂白巧伙母(_n)"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:50
 msgid "VFolder on _Recipients"
 msgstr "熬耨樊及移邂白巧伙母(_R)"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
+msgid "VFolder on _Subject"
+msgstr "瘀抩及移邂白巧伙母(_S)"
+
+#: ui/evolution-mail.xml.h:52
 msgid "View Raw Message Source"
 msgstr "怳笛鼎丟永本□斥及末□旦毛刓憎仄引允"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:53
+msgid "Virtual Folder _Editor..."
+msgstr "移邂白巧伙母巨犯奴正(_E)..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "_Apply Filters"
 msgstr "白奴伙正贗迕(_A)"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "白巧伙母及澀爛(_C)..."
+#: ui/evolution-mail.xml.h:55
+msgid "_Attachment"
+msgstr "驕尥(_A)"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:56
+msgid "_Compose"
+msgstr "綜嶽(_C)"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Copy to Folder..."
 msgstr "白巧伙母尺戊疋□(_C)..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "丟永本□斥毛彸螂(_E)"
+#: ui/evolution-mail.xml.h:58
+msgid "_Create Filter From Message"
+msgstr "丟永本□斥井日白奴伙正毛綜嶽(_C)"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:60
 msgid "_Expunge"
 msgstr "坫壅(_E)"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "瘀抩及白奴伙正(_F)"
+#: ui/evolution-mail.xml.h:61
+msgid "_Filters..."
+msgstr "白奴伙正(_F)..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+msgid "_Folder"
+msgstr "白巧伙母(_F)"
+
+#: ui/evolution-mail.xml.h:63
 msgid "_Forward"
 msgstr "鱉霜(_F)"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:64
+msgid "_Inline"
+msgstr "奶件仿奶件(_I)"
+
+#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "薊鎗毛�鱉(_I)"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "丟□伙及澀爛(_M)..."
+#: ui/evolution-mail.xml.h:66
+msgid "_Mail Message"
+msgstr "丟永本□斥毛丟□伙(_M)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "丟永本□斥(_M)"
+#: ui/evolution-mail.xml.h:67
+msgid "_Mail Settings..."
+msgstr "丟□伙澀爛(_M)..."
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:68
 msgid "_Move to Folder..."
 msgstr "白巧伙母尺啖⑹(_M)..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "蕙筋它奴件玉它卞釩仁(_O)"
+#: ui/evolution-mail.xml.h:69
+msgid "_Open Selected Items"
+msgstr "薊鎗今木凶失奶氾丞毛釩仁(_O)"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "丟永本□斥毛執綬(_P)"
+#: ui/evolution-mail.xml.h:71
+msgid "_Quoted"
+msgstr "婁迕(_Q)"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "丟永本□斥毛帎抩匹忡繡(_S)..."
+#: ui/evolution-mail.xml.h:72
+msgid "_Reply"
+msgstr "忒耨(_R)"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:73
+msgid "_Resend Messages"
+msgstr "丟永本□斥毛瘋霜耨(_R)"
+
+#: ui/evolution-mail.xml.h:75
+msgid "_Send / Receive"
+msgstr "霜熬耨(_S)"
+
+#: ui/evolution-mail.xml.h:76
 msgid "_Threaded"
 msgstr "旦伊永玉(_T)"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:78
 msgid "_Undelete"
 msgstr "綽輪潸壅(_U)"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "瘀抩及移邂白巧伙母(_V)"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "移邂白巧伙母巨犯奴正(_V)..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "驕尥"
@@ -7539,15 +7806,51 @@ msgstr "驕尥毛刓憎"
 msgid "Sign this message with your PGP key"
 msgstr "PGP萼匹仇及丟永本□斥卞扔奶件仄引允"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr "BCC 白奴□伙玉毛刓憎允月井升丹井濠贅尹引允"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr "CC 白奴□伙玉毛刓憎允月井升丹井濠贅尹引允"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+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 "Bcc 白奴□伙玉(_B)"
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr "Cc 白奴□伙玉(_C)"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr "犒請諦白奴□伙玉(_F)"
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "醣じ(_I)"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "氾平旦玄白央奶伙及醣じ(_I)... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "釩仁(_O)..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr "忒耨燮白奴□伙玉(_R)"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "本平亙伉氾奴(_S)"
 
@@ -7555,6 +7858,10 @@ msgstr "本平亙伉氾奴(_S)"
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "白巧伙母(_o)"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "伉旦玄毛凳蕙"
@@ -7635,7 +7942,7 @@ msgstr "葭卞枑允"
 msgid "Undo the last action"
 msgstr "瘉詨及⑹綜毛葭卞枑仄引允"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "沶竄(_A) (FIXME)"
 
@@ -7652,8 +7959,8 @@ msgid "Create a new task"
 msgstr "蕙筋正旦弁毛綜嶽仄引允"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "蕙筋"
+msgid "New Task"
+msgstr "蕙筋正旦弁"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7663,6 +7970,10 @@ msgstr "帎及手及午仄化正旦弁毛忡繡仄引允"
 msgid "Tasks Preferences..."
 msgstr "正旦弁及澀爛..."
 
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr "正旦弁(_T)"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Evolution 卞勾中化..."
@@ -7672,8 +7983,8 @@ msgid "Close this window"
 msgstr "仇及它奴件玉它毛岉元引允"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "市旦正穴奶朮(_z)..."
+msgid "Customi_ze Toolbars..."
+msgstr "汁□伙田□及市旦正穴奶朮(_z)..."
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7696,76 +8007,72 @@ msgid "Evolution bar _shortcut"
 msgstr "Evolution 田□扑亦□玄市永玄(_s)"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "蔽弇"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "皿伕弘仿丞毛蔽弇仄引允"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "銨戶卞(_S)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "陸朿白央奶伙溥摯毛奶件禾□玄仄引允"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "丟奶件汁□伙田□"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Evolution 卞勾中化及樹扷毛刓憎仄引允"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "白巧伙母田□毛刓憎(_F)"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "扑亦□玄市永玄田□毛刓憎(_S)"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "尕填寧扷屢及羼請"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "尕填寧扷屢及羼請(_B)"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy毛銀勻化尕填寧扷屢毛羼請仄引允"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "白巧伙母田□毛刓憎允月井升丹井濠贅尹引允"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "扑亦□玄市永玄田□毛刓憎允月井升丹井濠贅尹引允"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "戊件正弁玄穴生□斥乓毛銀丹(_o)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "市伊件母毛銀丹(_C)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "丟□仿毛銀丹(_M)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr "左白仿奶件綜僅"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "Evolution 卞勾中化(_A)..."
 
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "⑹綜(_A)"
+
 #: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "白巧伙母(_F)"
+msgid "_Folder Bar"
+msgstr "白巧伙母田□(_F)"
 
 #: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
@@ -7784,15 +8091,19 @@ msgid "_Mail message"
 msgstr "丟永本□斥毛丟□伙(_M)"
 
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "澀爛(_S)"
+msgid "_New Folder"
+msgstr "蕙筋白巧伙母(_N)"
+
+#: ui/evolution.xml.h:40
+msgid "_Shortcut Bar"
+msgstr "扑亦□玄市永玄田□(_S)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
-msgstr "%Y %B %d %A"
+msgstr "%Yコ %m畸 %dざ %A"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
@@ -7866,6 +8177,10 @@ msgstr "莘腔蔽弇凜棉(_e):"
 msgid "All Attendees"
 msgstr "允屯化及尥五驕中"
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr "蜇箕及刓憎(_C)"
+
 #. 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
@@ -7877,25 +8192,34 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%Y %B"
 
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "漆"
+
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr "OK"
+
+#: widgets/misc/e-cell-date-edit.c:720
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "凜棉反白巧□穴永玄卞じ木卅仃木壬卅曰引六氏: %s"
+
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "漆"
+#: widgets/misc/e-filter-bar.c:160
+msgid "Save Search"
+msgstr ""
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#: widgets/misc/e-filter-bar.c:231
+msgid "Advanced Search"
+msgstr "曉菟腹綢"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%p %I:%M"
+#: widgets/misc/e-filter-bar.c:311
+msgid "Advanced ..."
+msgstr "曉菟 ..."
 
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
@@ -7918,7 +8242,7 @@ msgstr "丟永本□斥"
 msgid "Don't show this message again."
 msgstr "仇及丟永本□斥毛き蘸午刓憎仄卅中"
 
-#: widgets/misc/e-search-bar.c:135
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "腹綢(_c)"
 
@@ -7930,18 +8254,14 @@ msgstr "由□末瓜伙失玉伊旦罌扔□田"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "由□末瓜伙市伊件母扔□田; 市伊件母白央弁玄伉"
 
-#: wombat/wombat.c:182
+#: wombat/wombat.c:165
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS毛賡渝祭允月仇午互請侳引六氏匹仄凶"
 
-#: wombat/wombat.c:194
+#: wombat/wombat.c:177
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME 毛賡渝祭允月仇午互請侳引六氏匹仄凶"
 
-#: wombat/wombat.c:207
+#: wombat/wombat.c:190
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo 毛賡渝祭允月仇午互請侳引六氏匹仄凶"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution 弘伙□皿它尼失旦奶□玄"
author	Akira Tagoh <tagoh@src.gnome.org>	2001-03-23 03:31:38 +0800
committer	Akira Tagoh <tagoh@src.gnome.org>	2001-03-23 03:31:38 +0800
commit	65cb1664da2ba2bb678ee78b8dff1fd01b297cc0 (patch)
tree	96c39d5bd77f5f2010083900107516790b6c7b90 /po
parent	81742b667755e307683e6178d073ee8f31661d5c (diff)
download	gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.gz gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.zst gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.zip